BaseTools: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / BaseTools / Source / Python / Ecc / MetaFileWorkspace / MetaDataTable.py

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py
index 0d53f05d8bc11a1d9fd9806cadcb1dd8f3b37600..1d7f6eb10434e78dcac8ed44998b2a4f2192fe83 100644 (file)
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py
@@ -1,19 +1,14 @@
 ## @file\r
 # This file is used to create/update/query/erase table for files\r
 #\r
-# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.  The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 ##\r
 # Import Modules\r
 #\r
+from __future__ import print_function\r
 import Common.LongFilePathOs as os\r
 \r
 import Common.EdkLogger as EdkLogger\r
@@ -73,7 +68,7 @@ class Table(object):
         self.ID = self.ID + self._ID_STEP_\r
         if self.ID >= (self.IdBase + self._ID_MAX_):\r
             self.ID = self.IdBase + self._ID_STEP_\r
-        Values = ", ".join([str(Arg) for Arg in Args])\r
+        Values = ", ".join(str(Arg) for Arg in Args)\r
         SqlCommand = "insert into %s values(%s, %s)" % (self.Table, self.ID, Values)\r
         EdkLogger.debug(EdkLogger.DEBUG_5, SqlCommand)\r
         self.Cur.execute(SqlCommand)\r
@@ -98,8 +93,8 @@ class Table(object):
         SqlCommand = """drop table IF EXISTS %s""" % self.Table\r
         try:\r
             self.Cur.execute(SqlCommand)\r
-        except sqlite3.Error, e:\r
-            print "An error occurred when Drop a table:", e.args[0]\r
+        except Exception as e:\r
+            print("An error occurred when Drop a table:", e.args[0])\r
 \r
     ## Get count\r
     #\r
@@ -116,7 +111,7 @@ class Table(object):
         SqlCommand = """select max(ID) from %s""" % self.Table\r
         Record = self.Cur.execute(SqlCommand).fetchall()\r
         Id = Record[0][0]\r
-        if Id == None:\r
+        if Id is None:\r
             Id = self.IdBase\r
         return Id\r
 \r
@@ -191,7 +186,7 @@ class TableDataModel(Table):
     def InitTable(self):\r
         EdkLogger.verbose("\nInitialize table DataModel started ...")\r
         Count = self.GetCount()\r
-        if Count != None and Count != 0:\r
+        if Count is not None and Count != 0:\r
             return\r
         for Item in DataClass.MODEL_LIST:\r
             CrossIndex = Item[1]\r