BaseTools: Fix old python2 idioms

[mirror_edk2.git] / BaseTools / Source / Python / UPT / PomAdapter / InfPomAlignment.py

diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
index 165ac111272a23a6da56c7d4c3c4900bf3936106..84f0d43f015ed4513e2771ef4d52564973afc0f8 100644 (file)
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
@@ -1,7 +1,7 @@
 ## @file InfPomAlignment.py\r
 # This file contained the adapter for convert INF parser object to POM Object\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
@@ -20,10 +20,10 @@ InfPomAlignment
 import os.path\r
 from Logger import StringTable as ST\r
 import Logger.Log as Logger\r
-from Library.String import FORMAT_INVALID\r
-from Library.String import PARSER_ERROR\r
-from Library.String import NormPath\r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import FORMAT_INVALID\r
+from Library.StringUtils import PARSER_ERROR\r
+from Library.StringUtils import NormPath\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.Misc import ConvertVersionToDecimal\r
 from Library.Misc import GetHelpStringByRemoveHashKey\r
 from Library.Misc import ConvertArchList\r
@@ -611,8 +611,7 @@ class InfPomAlignment(ModuleObject):
                 SourceFile = Item.GetSourceFileName()\r
                 Family = Item.GetFamily()\r
                 FeatureFlag = Item.GetFeatureFlagExp()\r
-                SupArchList = ConvertArchList(Item.GetSupArchList())\r
-                SupArchList.sort()\r
+                SupArchList = sorted(ConvertArchList(Item.GetSupArchList()))\r
                 Source = SourceFileObject()\r
                 Source.SetSourceFile(SourceFile)\r
                 Source.SetFamily(Family)\r