Revert BaseTools: PYTHON3 migration

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

diff --git a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
index 78d3c91581e18a65145a1f0ef556ad968c96a9f3..4726629695803cfa2ef115486a3b43dc49bfe452 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
+++ b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
@@ -124,46 +124,50 @@ def GenHeaderCommentSection(Abstract, Description, Copyright, License, IsBinaryH
     #\r
     # Convert special character to (c), (r) and (tm).\r
     #\r
+    if isinstance(Abstract, unicode):\r
+        Abstract = ConvertSpecialUnicodes(Abstract)\r
+    if isinstance(Description, unicode):\r
+        Description = ConvertSpecialUnicodes(Description)\r
     if IsBinaryHeader:\r
-        Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_BINARY_HEADER_COMMENT + '\n'\r
+        Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_BINARY_HEADER_COMMENT + '\r\n'\r
     elif CommChar == TAB_COMMENT_EDK1_SPLIT:\r
         Content += CommChar + TAB_SPACE_SPLIT + TAB_COMMENT_EDK1_START + TAB_STAR + TAB_SPACE_SPLIT +\\r
-         TAB_HEADER_COMMENT + '\n'\r
+         TAB_HEADER_COMMENT + '\r\n'\r
     else:\r
-        Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_HEADER_COMMENT + '\n'\r
+        Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_HEADER_COMMENT + '\r\n'\r
     if Abstract:\r
-        Abstract = Abstract.rstrip('\n')\r
-        Content += CommChar + TAB_SPACE_SPLIT + ('\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
+        Abstract = Abstract.rstrip('\r\n')\r
+        Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
                                                                                                 (Abstract, '\n'))\r
-        Content += '\n' + CommChar + '\n'\r
+        Content += '\r\n' + CommChar + '\r\n'\r
     else:\r
-        Content += CommChar + '\n'\r
+        Content += CommChar + '\r\n'\r
 \r
     if Description:\r
-        Description = Description.rstrip('\n')\r
-        Content += CommChar + TAB_SPACE_SPLIT + ('\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
+        Description = Description.rstrip('\r\n')\r
+        Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
                                                   (Description, '\n'))\r
-        Content += '\n' + CommChar + '\n'\r
+        Content += '\r\n' + CommChar + '\r\n'\r
 \r
     #\r
     # There is no '#\n' line to separate multiple copyright lines in code base\r
     #\r
     if Copyright:\r
-        Copyright = Copyright.rstrip('\n')\r
-        Content += CommChar + TAB_SPACE_SPLIT + ('\n' + CommChar + TAB_SPACE_SPLIT).join\\r
+        Copyright = Copyright.rstrip('\r\n')\r
+        Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join\\r
         (GetSplitValueList(Copyright, '\n'))\r
-        Content += '\n' + CommChar + '\n'\r
+        Content += '\r\n' + CommChar + '\r\n'\r
 \r
     if License:\r
-        License = License.rstrip('\n')\r
-        Content += CommChar + TAB_SPACE_SPLIT + ('\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
+        License = License.rstrip('\r\n')\r
+        Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
                                                   (License, '\n'))\r
-        Content += '\n' + CommChar + '\n'\r
+        Content += '\r\n' + CommChar + '\r\n'\r
 \r
     if CommChar == TAB_COMMENT_EDK1_SPLIT:\r
-        Content += CommChar + TAB_SPACE_SPLIT + TAB_STAR + TAB_COMMENT_EDK1_END + '\n'\r
+        Content += CommChar + TAB_SPACE_SPLIT + TAB_STAR + TAB_COMMENT_EDK1_END + '\r\n'\r
     else:\r
-        Content += CommChar * 2 + '\n'\r
+        Content += CommChar * 2 + '\r\n'\r
 \r
     return Content\r
 \r