BaseTools: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Object / Parser / InfPcdObject.py

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
index d2712a97f2ff34c1be8f3ab22b33d521ff0e90eb..fd8065fab5f4473ac922389c276f738c02c29a03 100644 (file)
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
@@ -1,16 +1,10 @@
 ## @file\r
-# This file is used to define class objects of INF file [Pcds] section. \r
-# It will consumed by InfParser. \r
+# This file is used to define class objects of INF file [Pcds] section.\r
+# It will consumed by InfParser.\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
-# This program and the accompanying materials are licensed and made available \r
-# under the terms and conditions of the BSD License which accompanies this \r
-# 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
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 '''\r
 InfPcdObject\r
@@ -31,8 +25,8 @@ from Library.ParserValidate import IsValidCVariableName
 from Library.ParserValidate import IsValidPcdValue\r
 from Library.ParserValidate import IsValidArch\r
 from Library.CommentParsing import ParseComment\r
-from Library.String import GetSplitValueList\r
-from Library.String import IsHexDigitUINT32\r
+from Library.StringUtils import GetSplitValueList\r
+from Library.StringUtils import IsHexDigitUINT32\r
 from Library.ExpressionValidate import IsValidFeatureFlagExp\r
 from Parser.InfAsBuiltProcess import GetPackageListInfo\r
 from Parser.DecParser import Dec\r
@@ -42,7 +36,7 @@ from Object.Parser.InfPackagesObject import InfPackageItem
 def ValidateArch(ArchItem, PcdTypeItem1, LineNo, SupArchDict, SupArchList):\r
     #\r
     # Validate Arch\r
-    #            \r
+    #\r
     if (ArchItem == '' or ArchItem is None):\r
         ArchItem = 'COMMON'\r
 \r
@@ -122,7 +116,7 @@ def ParsePcdComment(CommentList, PcdTypeItem, PcdItemObj):
                     BlockFlag = 4\r
         #\r
         # Combine two comment line if they are generic comment\r
-        #   \r
+        #\r
         if CommentItemUsage == PreUsage == DT.ITEM_UNDEFINED:\r
             CommentItemHelpText = PreHelpText + DT.END_OF_LINE + CommentItemHelpText\r
 \r
@@ -141,7 +135,7 @@ def ParsePcdComment(CommentList, PcdTypeItem, PcdItemObj):
         elif BlockFlag == 3:\r
             #\r
             # Add previous help string\r
-            # \r
+            #\r
             CommentItemIns = InfPcdItemCommentContent()\r
             CommentItemIns.SetUsageItem(DT.ITEM_UNDEFINED)\r
             if PreHelpText == '' or PreHelpText.endswith(DT.END_OF_LINE):\r
@@ -171,7 +165,7 @@ def ParsePcdComment(CommentList, PcdTypeItem, PcdItemObj):
 class InfPcdItemCommentContent():\r
     def __init__(self):\r
         #\r
-        # ## SOMETIMES_CONSUMES ## HelpString \r
+        # ## SOMETIMES_CONSUMES ## HelpString\r
         #\r
         self.UsageItem = ''\r
         #\r
@@ -195,7 +189,7 @@ class InfPcdItemCommentContent():
 #\r
 # @param CName:                Input value for CName, default is ''\r
 # @param Token:                Input value for Token, default is ''\r
-# @param TokenSpaceGuidCName:  Input value for TokenSpaceGuidCName, default \r
+# @param TokenSpaceGuidCName:  Input value for TokenSpaceGuidCName, default\r
 #                              is ''\r
 # @param DatumType:            Input value for DatumType, default is ''\r
 # @param MaxDatumSize:         Input value for MaxDatumSize, default is ''\r
@@ -385,7 +379,7 @@ class InfPcdObject():
                                      Line=CurrentLineOfPcdItem[1],\r
                                      ExtraData=CurrentLineOfPcdItem[0])\r
                     #\r
-                    # Validate FFE    \r
+                    # Validate FFE\r
                     #\r
                     FeatureFlagRtv = IsValidFeatureFlagExp(PcdItem[2].strip())\r
                     if not FeatureFlagRtv[0]:\r
@@ -411,7 +405,7 @@ class InfPcdObject():
                 else:\r
                     PcdItemObj.SetSupportArchList(SupArchList)\r
 \r
-                if self.Pcds.has_key((PcdTypeItem, PcdItemObj)):\r
+                if (PcdTypeItem, PcdItemObj) in self.Pcds:\r
                     PcdsList = self.Pcds[PcdTypeItem, PcdItemObj]\r
                     PcdsList.append(PcdItemObj)\r
                     self.Pcds[PcdTypeItem, PcdItemObj] = PcdsList\r
@@ -456,7 +450,7 @@ class InfPcdObject():
                                                       PackageInfo)\r
 \r
             PcdTypeItem = KeysList[0][0]\r
-            if self.Pcds.has_key((PcdTypeItem, PcdItemObj)):\r
+            if (PcdTypeItem, PcdItemObj) in self.Pcds:\r
                 PcdsList = self.Pcds[PcdTypeItem, PcdItemObj]\r
                 PcdsList.append(PcdItemObj)\r
                 self.Pcds[PcdTypeItem, PcdItemObj] = PcdsList\r
@@ -478,7 +472,7 @@ def ParserPcdInfoInDec(String):
 \r
 def SetValueDatumTypeMaxSizeToken(PcdItem, CurrentLineOfPcdItem, PcdItemObj, Arch, PackageInfo=None):\r
     #\r
-    # Package information not been generated currently, we need to parser INF file to get information. \r
+    # Package information not been generated currently, we need to parser INF file to get information.\r
     #\r
     if not PackageInfo:\r
         PackageInfo = []\r
@@ -507,7 +501,7 @@ def SetValueDatumTypeMaxSizeToken(PcdItem, CurrentLineOfPcdItem, PcdItemObj, Arc
             DecParser = GlobalData.gPackageDict[FullFileName]\r
 \r
         #\r
-        # Find PCD information.               \r
+        # Find PCD information.\r
         #\r
         DecPcdsDict = DecParser.GetPcdSectionObject().ValueDict\r
         for Key in DecPcdsDict.keys():\r
@@ -640,7 +634,7 @@ def ValidatePcdValueOnDatumType(Value, Type):
 \r
 def SetPcdName(PcdItem, CurrentLineOfPcdItem, PcdItemObj):\r
     #\r
-    # Only PCD Name specified \r
+    # Only PCD Name specified\r
     # <PcdName> ::= <TokenSpaceGuidCName> "." <TokenCName>\r
     #\r
     PcdId = GetSplitValueList(PcdItem[0], DT.TAB_SPLIT)\r