BaseTools: Refactor python print statements

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Library / CommentParsing.py

diff --git a/BaseTools/Source/Python/UPT/Library/CommentParsing.py b/BaseTools/Source/Python/UPT/Library/CommentParsing.py
index 38f7012fd4f8f823325004a8a64c411220299e30..8ee788bd7724e097efb0fbfea980a4ef997bb4c2 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/CommentParsing.py
+++ b/BaseTools/Source/Python/UPT/Library/CommentParsing.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to define comment parsing interface\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
@@ -21,8 +21,8 @@ CommentParsing
 #\r
 import re\r
 \r
-from Library.String import GetSplitValueList\r
-from Library.String import CleanString2\r
+from Library.StringUtils import GetSplitValueList\r
+from Library.StringUtils import CleanString2\r
 from Library.DataType import HEADER_COMMENT_NOT_STARTED\r
 from Library.DataType import TAB_COMMENT_SPLIT\r
 from Library.DataType import HEADER_COMMENT_LICENSE\r
@@ -217,7 +217,7 @@ def ParsePcdErrorCode (Value = None, ContainerFile = None, LineNum = None):
         # To delete the tailing 'L'\r
         #\r
         return hex(ErrorCode)[:-1]\r
-    except ValueError, XStr:\r
+    except ValueError as XStr:\r
         if XStr:\r
             pass\r
         Logger.Error('Parser', \r