arc = self._tryhook(path)\r
if arc and os.path.isfile(path):\r
self._createzip()\r
- self.zip.write(path, arc.encode('utf_8'))\r
+ self.zip.write(path, arc)\r
sta = os.stat(path)\r
oldmode = stat.S_IMODE(sta.st_mode)\r
self.rlist.append(_PathInfo(_CHMOD, path, oldmode))\r
Dir = os.path.dirname(DbPath)\r
if not os.path.isdir(Dir):\r
os.mkdir(Dir)\r
- self.Conn = sqlite3.connect(unicode(DbPath), isolation_level='DEFERRED')\r
+ self.Conn = sqlite3.connect(DbPath, isolation_level='DEFERRED')\r
self.Conn.execute("PRAGMA page_size=4096")\r
self.Conn.execute("PRAGMA synchronous=OFF")\r
self.Cur = self.Conn.cursor()\r
\r
ContainerFile = GetUniFileName(os.path.dirname(PackageObject.GetFullPath()), PackageObject.GetBaseName())\r
\r
- Content = UniFileHeader + '\r\n'\r
- Content += '\r\n'\r
+ Content = UniFileHeader + '\n'\r
+ Content += '\n'\r
\r
- Content += FormatUniEntry('#string ' + TAB_DEC_PACKAGE_ABSTRACT, PackageObject.GetAbstract(), ContainerFile) + '\r\n'\r
+ Content += FormatUniEntry('#string ' + TAB_DEC_PACKAGE_ABSTRACT, PackageObject.GetAbstract(), ContainerFile) + '\n'\r
\r
Content += FormatUniEntry('#string ' + TAB_DEC_PACKAGE_DESCRIPTION, PackageObject.GetDescription(), ContainerFile) \\r
- + '\r\n'\r
+ + '\n'\r
\r
- Content += FormatUniEntry('#string ' + TAB_DEC_BINARY_ABSTRACT, BinaryAbstract, ContainerFile) + '\r\n'\r
+ Content += FormatUniEntry('#string ' + TAB_DEC_BINARY_ABSTRACT, BinaryAbstract, ContainerFile) + '\n'\r
\r
- Content += FormatUniEntry('#string ' + TAB_DEC_BINARY_DESCRIPTION, BinaryDescription, ContainerFile) + '\r\n'\r
+ Content += FormatUniEntry('#string ' + TAB_DEC_BINARY_DESCRIPTION, BinaryDescription, ContainerFile) + '\n'\r
\r
PromptGenList = []\r
HelpTextGenList = []\r
if (PcdPromptStrName, Lang) not in PromptGenList:\r
TokenValueList.append((Lang, PromptStr))\r
PromptGenList.append((PcdPromptStrName, Lang))\r
- PromptString = FormatUniEntry(PcdPromptStrName, TokenValueList, ContainerFile) + '\r\n'\r
+ PromptString = FormatUniEntry(PcdPromptStrName, TokenValueList, ContainerFile) + '\n'\r
if PromptString not in Content:\r
Content += PromptString\r
\r
if (PcdHelpStrName, Lang) not in HelpTextGenList:\r
TokenValueList.append((Lang, HelpStr))\r
HelpTextGenList.append((PcdHelpStrName, Lang))\r
- HelpTextString = FormatUniEntry(PcdHelpStrName, TokenValueList, ContainerFile) + '\r\n'\r
+ HelpTextString = FormatUniEntry(PcdHelpStrName, TokenValueList, ContainerFile) + '\n'\r
if HelpTextString not in Content:\r
Content += HelpTextString\r
\r
PcdErrStrName = '#string ' + TAB_STR_TOKENCNAME + TAB_UNDERLINE_SPLIT + Pcd.GetTokenSpaceGuidCName() \\r
+ TAB_UNDERLINE_SPLIT + TAB_STR_TOKENERR \\r
+ TAB_UNDERLINE_SPLIT + ErrorNo[2:]\r
- PcdErrString = FormatUniEntry(PcdErrStrName, PcdError.GetErrorMessageList(), ContainerFile) + '\r\n'\r
+ PcdErrString = FormatUniEntry(PcdErrStrName, PcdError.GetErrorMessageList(), ContainerFile) + '\n'\r
if PcdErrString not in Content:\r
Content += PcdErrString\r
\r
if not os.path.exists(os.path.dirname(ModuleObject.GetFullPath())):\r
os.makedirs(os.path.dirname(ModuleObject.GetFullPath()))\r
\r
- Content = UniFileHeader + '\r\n'\r
- Content += '\r\n'\r
+ Content = UniFileHeader + '\n'\r
+ Content += '\n'\r
\r
- Content += FormatUniEntry('#string ' + DT.TAB_INF_ABSTRACT, ModuleObject.GetAbstract(), ContainerFile) + '\r\n'\r
+ Content += FormatUniEntry('#string ' + DT.TAB_INF_ABSTRACT, ModuleObject.GetAbstract(), ContainerFile) + '\n'\r
\r
Content += FormatUniEntry('#string ' + DT.TAB_INF_DESCRIPTION, ModuleObject.GetDescription(), ContainerFile) \\r
- + '\r\n'\r
+ + '\n'\r
\r
BinaryAbstractString = FormatUniEntry('#string ' + DT.TAB_INF_BINARY_ABSTRACT, BinaryAbstract, ContainerFile)\r
if BinaryAbstractString:\r
- Content += BinaryAbstractString + '\r\n'\r
+ Content += BinaryAbstractString + '\n'\r
\r
BinaryDescriptionString = FormatUniEntry('#string ' + DT.TAB_INF_BINARY_DESCRIPTION, BinaryDescription, \\r
ContainerFile)\r
if BinaryDescriptionString:\r
- Content += BinaryDescriptionString + '\r\n'\r
+ Content += BinaryDescriptionString + '\n'\r
\r
if not os.path.exists(ContainerFile):\r
File = codecs.open(ContainerFile, 'wb', Encoding)\r
if not DefinesDict:\r
continue\r
for Statement in DefinesDict:\r
- if Statement.split(DT.TAB_EQUAL_SPLIT) > 1:\r
+ if len(Statement.split(DT.TAB_EQUAL_SPLIT)) > 1:\r
Statement = (u'%s ' % Statement.split(DT.TAB_EQUAL_SPLIT, 1)[0]).ljust(LeftOffset) \\r
+ u'= %s' % Statement.split(DT.TAB_EQUAL_SPLIT, 1)[1].lstrip()\r
SortedArch = DT.TAB_ARCH_COMMON\r
Statement += '|' + FFE\r
ModuleList = LibraryClass.GetSupModuleList()\r
ArchList = LibraryClass.GetSupArchList()\r
- for Index in xrange(0, len(ArchList)):\r
+ for Index in range(0, len(ArchList)):\r
ArchList[Index] = ConvertArchForInstall(ArchList[Index])\r
ArchList.sort()\r
SortedArch = ' '.join(ArchList)\r
# if not Statement:\r
# continue\r
ArchList = UserExtension.GetSupArchList()\r
- for Index in xrange(0, len(ArchList)):\r
+ for Index in range(0, len(ArchList)):\r
ArchList[Index] = ConvertArchForInstall(ArchList[Index])\r
ArchList.sort()\r
KeyList = []\r
#\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 + '\r\n'\r
+ Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_BINARY_HEADER_COMMENT + '\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 + '\r\n'\r
+ TAB_HEADER_COMMENT + '\n'\r
else:\r
- Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_HEADER_COMMENT + '\r\n'\r
+ Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_HEADER_COMMENT + '\n'\r
if Abstract:\r
- Abstract = Abstract.rstrip('\r\n')\r
- Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
+ Abstract = Abstract.rstrip('\n')\r
+ Content += CommChar + TAB_SPACE_SPLIT + ('\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
(Abstract, '\n'))\r
- Content += '\r\n' + CommChar + '\r\n'\r
+ Content += '\n' + CommChar + '\n'\r
else:\r
- Content += CommChar + '\r\n'\r
+ Content += CommChar + '\n'\r
\r
if Description:\r
- Description = Description.rstrip('\r\n')\r
- Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
+ Description = Description.rstrip('\n')\r
+ Content += CommChar + TAB_SPACE_SPLIT + ('\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
(Description, '\n'))\r
- Content += '\r\n' + CommChar + '\r\n'\r
+ Content += '\n' + CommChar + '\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('\r\n')\r
- Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join\\r
+ Copyright = Copyright.rstrip('\n')\r
+ Content += CommChar + TAB_SPACE_SPLIT + ('\n' + CommChar + TAB_SPACE_SPLIT).join\\r
(GetSplitValueList(Copyright, '\n'))\r
- Content += '\r\n' + CommChar + '\r\n'\r
+ Content += '\n' + CommChar + '\n'\r
\r
if License:\r
- License = License.rstrip('\r\n')\r
- Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
+ License = License.rstrip('\n')\r
+ Content += CommChar + TAB_SPACE_SPLIT + ('\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
(License, '\n'))\r
- Content += '\r\n' + CommChar + '\r\n'\r
+ Content += '\n' + CommChar + '\n'\r
\r
if CommChar == TAB_COMMENT_EDK1_SPLIT:\r
- Content += CommChar + TAB_SPACE_SPLIT + TAB_STAR + TAB_COMMENT_EDK1_END + '\r\n'\r
+ Content += CommChar + TAB_SPACE_SPLIT + TAB_STAR + TAB_COMMENT_EDK1_END + '\n'\r
else:\r
- Content += CommChar * 2 + '\r\n'\r
+ Content += CommChar * 2 + '\n'\r
\r
return Content\r
\r
# first find the last copyright line\r
#\r
Last = 0\r
- for Index in xrange(len(CommentList)-1, 0, -1):\r
+ for Index in range(len(CommentList)-1, 0, -1):\r
Line = CommentList[Index][0]\r
if _IsCopyrightLine(Line):\r
Last = Index\r
Base = 16\r
else:\r
Base = 10\r
- ErrorCode = long(Value, Base)\r
+ ErrorCode = int(Value, Base)\r
if ErrorCode > PCD_ERR_CODE_MAX_SIZE or ErrorCode < 0:\r
Logger.Error('Parser',\r
FORMAT_NOT_SUPPORTED,\r
"The format %s of ErrorCode is not valid, should be UNIT32 type or long type" % Value,\r
File = ContainerFile,\r
Line = LineNum)\r
- #\r
- # To delete the tailing 'L'\r
- #\r
- return hex(ErrorCode)[:-1]\r
+ return hex(ErrorCode)\r
except ValueError as XStr:\r
if XStr:\r
pass\r
'''\r
ExpressionValidate\r
'''\r
-from __future__ import print_function\r
\r
##\r
# Import Modules\r
from os import walk\r
from os import environ\r
import re\r
-from UserDict import IterableUserDict\r
+from collections import UserDict as IterableUserDict\r
\r
import Logger.Log as Logger\r
from Logger import StringTable as ST\r
# or not\r
#\r
def SaveFileOnChange(File, Content, IsBinaryFile=True):\r
- if not IsBinaryFile:\r
- Content = Content.replace("\n", linesep)\r
-\r
if os.path.exists(File):\r
try:\r
- if Content == __FileHookOpen__(File, "rb").read():\r
- return False\r
+ if isinstance(Content, bytes):\r
+ if Content == __FileHookOpen__(File, "rb").read():\r
+ return False\r
+ else:\r
+ if Content == __FileHookOpen__(File, "r").read():\r
+ return False\r
except BaseException:\r
Logger.Error(None, ToolError.FILE_OPEN_FAILURE, ExtraData=File)\r
\r
CreateDirectory(os.path.dirname(File))\r
try:\r
- FileFd = __FileHookOpen__(File, "wb")\r
+ if isinstance(Content, bytes):\r
+ FileFd = __FileHookOpen__(File, "wb")\r
+ else:\r
+ FileFd = __FileHookOpen__(File, "w")\r
FileFd.write(Content)\r
FileFd.close()\r
except BaseException:\r
def CommonPath(PathList):\r
Path1 = min(PathList).split(os.path.sep)\r
Path2 = max(PathList).split(os.path.sep)\r
- for Index in xrange(min(len(Path1), len(Path2))):\r
+ for Index in range(min(len(Path1), len(Path2))):\r
if Path1[Index] != Path2[Index]:\r
return os.path.sep.join(Path1[:Index])\r
return os.path.sep.join(Path1)\r
if FindEdkBlockComment:\r
if FirstPos == -1:\r
FirstPos = StartPos\r
- for Index in xrange(StartPos, EndPos+1):\r
+ for Index in range(StartPos, EndPos+1):\r
LineList[Index] = ''\r
FindEdkBlockComment = False\r
elif Line.find("//") != -1 and not Line.startswith("#"):\r
FileLinesList = []\r
\r
try:\r
- FInputfile = open(FullFileName, "rb", 0)\r
+ FInputfile = open(FullFileName, "r")\r
try:\r
FileLinesList = FInputfile.readlines()\r
except BaseException:\r
#\r
def CheckUTF16FileHeader(File):\r
FileIn = open(File, 'rb').read(2)\r
- if FileIn != '\xff\xfe':\r
+ if FileIn != b'\xff\xfe':\r
return False\r
\r
return True\r
'''\r
Parsing\r
'''\r
-from __future__ import absolute_import\r
\r
##\r
# Import Modules\r
ArchList = GetSplitValueList(SectionAttrs, DataType.TAB_COMMENT_SPLIT)\r
else:\r
ArchList = [SectionAttrs]\r
- for Index in xrange(0, len(ArchList)):\r
+ for Index in range(0, len(ArchList)):\r
ArchList[Index] = ConvertArchForInstall(ArchList[Index])\r
Section = '[' + SectionName + '.' + (', ' + SectionName + '.').join(ArchList) + ']'\r
else:\r
#\r
import re\r
import os.path\r
-from string import strip\r
import Logger.Log as Logger\r
import Library.DataType as DataType\r
from Logger.ToolError import FORMAT_INVALID\r
#\r
#\r
def GetSplitValueList(String, SplitTag=DataType.TAB_VALUE_SPLIT, MaxSplit= -1):\r
- return map(lambda l: l.strip(), String.split(SplitTag, MaxSplit))\r
+ return list(map(lambda l: l.strip(), String.split(SplitTag, MaxSplit)))\r
\r
## MergeArches\r
#\r
#\r
LineList[1] = CleanString(LineList[1], CommentCharacter)\r
if ValueSplitFlag:\r
- Value = map(strip, LineList[1].split(ValueSplitCharacter))\r
+ Value = map(lambda x: x.strip(), LineList[1].split(ValueSplitCharacter))\r
else:\r
Value = CleanString(LineList[1], CommentCharacter).splitlines()\r
\r
#\r
# Regenerate FileContent\r
#\r
- NewFileContent = NewFileContent + Line + '\r\n'\r
+ NewFileContent = NewFileContent + Line + '\n'\r
\r
if IsFailed:\r
Logger.Error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName, RaiseError=Logger.IS_RAISE_ERROR)\r
def IsMatchArch(Arch1, Arch2):\r
if 'COMMON' in Arch1 or 'COMMON' in Arch2:\r
return True\r
- if isinstance(Arch1, basestring) and isinstance(Arch2, basestring):\r
+ if isinstance(Arch1, str) and isinstance(Arch2, str):\r
if Arch1 == Arch2:\r
return True\r
\r
- if isinstance(Arch1, basestring) and isinstance(Arch2, list):\r
+ if isinstance(Arch1, str) and isinstance(Arch2, list):\r
return Arch1 in Arch2\r
\r
- if isinstance(Arch2, basestring) and isinstance(Arch1, list):\r
+ if isinstance(Arch2, str) and isinstance(Arch1, list):\r
return Arch2 in Arch1\r
\r
if isinstance(Arch1, list) and isinstance(Arch2, list):\r
"""\r
Collect all defined strings in multiple uni files\r
"""\r
-from __future__ import print_function\r
\r
##\r
# Import Modules\r
for SubValue in ValueList:\r
if SubValue.strip():\r
SubValueContent += \\r
- ' ' * (PreFormatLength + len('#language en-US ')) + '\"%s\\n\"' % SubValue.strip() + '\r\n'\r
+ ' ' * (PreFormatLength + len('#language en-US ')) + '\"%s\\n\"' % SubValue.strip() + '\n'\r
SubValueContent = SubValueContent[(PreFormatLength + len('#language en-US ')):SubValueContent.rfind('\\n')] \\r
- + '\"' + '\r\n'\r
+ + '\"' + '\n'\r
SubContent += ' '*PreFormatLength + '#language %-5s ' % Lang + SubValueContent\r
if SubContent:\r
SubContent = StrTokenName + ' '*(PreFormatLength - len(StrTokenName)) + SubContent[PreFormatLength:]\r
def UpdateValue(self, Value = None):\r
if Value is not None:\r
if self.StringValue:\r
- self.StringValue = self.StringValue + '\r\n' + Value\r
+ self.StringValue = self.StringValue + '\n' + Value\r
else:\r
self.StringValue = Value\r
self.StringValueByteList = UniToHexList(self.StringValue)\r
if not Line.startswith(DT.TAB_COMMENT_EDK1_SPLIT) and HeaderStart and not HeaderEnd:\r
HeaderEnd = True\r
if Line.startswith(DT.TAB_COMMENT_EDK1_SPLIT) and HeaderStart and not HeaderEnd and FirstGenHeader:\r
- self.UniFileHeader += Line + '\r\n'\r
+ self.UniFileHeader += Line + '\n'\r
continue\r
\r
#\r
if FileIn[LineCount].strip().startswith('#language'):\r
Line = Line + FileIn[LineCount]\r
FileIn[LineCount-1] = Line\r
- FileIn[LineCount] = '\r\n'\r
+ FileIn[LineCount] = '\n'\r
LineCount -= 1\r
- for Index in xrange (LineCount + 1, len (FileIn) - 1):\r
+ for Index in range (LineCount + 1, len (FileIn) - 1):\r
if (Index == len(FileIn) -1):\r
- FileIn[Index] = '\r\n'\r
+ FileIn[Index] = '\n'\r
else:\r
FileIn[Index] = FileIn[Index + 1]\r
continue\r
Value = Value + Lines[IndexJ].strip()[1:-1]\r
CombineToken = False\r
else:\r
- Value = Value + Lines[IndexJ].strip()[1:-1] + '\r\n'\r
+ Value = Value + Lines[IndexJ].strip()[1:-1] + '\n'\r
else:\r
IndexI = IndexJ\r
break\r
- if Value.endswith('\r\n'):\r
- Value = Value[: Value.rfind('\r\n')]\r
+ if Value.endswith('\n'):\r
+ Value = Value[: Value.rfind('\n')]\r
Language = GetLanguageCode(Language, self.IsCompatibleMode, self.File)\r
self.AddStringToList(Name, Language, Value)\r
continue\r
MSG_VERSION_NUMBER = _("1.1")\r
MSG_VERSION = _("UEFI Packaging Tool (UEFIPT) - Revision " + \\r
MSG_VERSION_NUMBER)\r
-MSG_COPYRIGHT = _("Copyright (c) 2011 - 2016 Intel Corporation All Rights Reserved.")\r
+MSG_COPYRIGHT = _("Copyright (c) 2011 - 2018 Intel Corporation All Rights Reserved.")\r
MSG_VERSION_COPYRIGHT = _("\n %s\n %s" % (MSG_VERSION, MSG_COPYRIGHT))\r
MSG_USAGE = _("%s [options]\n%s" % ("UPT", MSG_VERSION_COPYRIGHT))\r
MSG_DESCRIPTION = _("The UEFIPT is used to create, " + \\r
# strings in your desired encoding before passing them to\r
# write().\r
#\r
- FromFile = os.path.normpath(FileObject.GetURI()).encode('utf_8')\r
+ FromFile = os.path.normpath(FileObject.GetURI())\r
FileFullPath = mws.join(WorkspaceDir, FromFile)\r
if FileFullPath in RePkgDict:\r
(DpGuid, DpVersion, DpName, Repackage) = RePkgDict[FileFullPath]\r
if not IsValidToken(PCD_TOKEN_PATTERN, Token):\r
self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN % Token)\r
elif not Token.startswith('0x') and not Token.startswith('0X'):\r
- if long(Token) > 4294967295:\r
+ if int(Token) > 4294967295:\r
self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN_INT % Token)\r
- Token = hex(long(Token))[:-1]\r
+ Token = hex(int(Token))\r
\r
- IntToken = long(Token, 0)\r
+ IntToken = int(Token, 0)\r
if (Guid, IntToken) in self.TokenMap:\r
if self.TokenMap[Guid, IntToken] != CName:\r
self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN_UNIQUE%(Token))\r
class Dec(_DecBase, _DecComments):\r
def __init__(self, DecFile, Parse = True):\r
try:\r
- Content = ConvertSpecialChar(open(DecFile, 'rb').readlines())\r
+ Content = ConvertSpecialChar(open(DecFile, 'r').readlines())\r
except BaseException:\r
Logger.Error(TOOL_NAME, FILE_OPEN_FAILURE, File=DecFile,\r
ExtraData=ST.ERR_DECPARSE_FILEOPEN % DecFile)\r
else:\r
Base = 10\r
try:\r
- TokenValue = long(Token, Base)\r
+ TokenValue = int(Token, Base)\r
except BaseException:\r
Valid, Cause = IsValidLogicalExpr(Token, True)\r
if Cause:\r
Value = Value.lstrip('0')\r
if not Value:\r
return True, ""\r
- Value = long(Value, 0)\r
+ Value = int(Value, 0)\r
TypeLenMap = {\r
#\r
# 0x00 - 0xff\r
\r
try:\r
FullFileName = FullFileName.replace('\\', '/')\r
- Inputfile = open(FullFileName, "rb", 0)\r
+ Inputfile = open(FullFileName, "r")\r
try:\r
FileLinesList = Inputfile.readlines()\r
except BaseException:\r
FileLinesList = []\r
\r
try:\r
- FInputfile = open(Filename, "rb", 0)\r
+ FInputfile = open(Filename, "r")\r
try:\r
FileLinesList = FInputfile.readlines()\r
except BaseException:\r
#\r
# Call parent class construct function\r
#\r
- super(InfParser, self).__init__()\r
+ super().__init__()\r
\r
self.WorkspaceDir = WorkspaceDir\r
self.SupArchList = DT.ARCH_LIST\r
if FilePath in cls.MetaFiles:\r
return cls.MetaFiles[FilePath]\r
else:\r
- ParserObject = super(InfSectionParser, cls).__new__(cls)\r
+ ParserObject = super().__new__(cls)\r
cls.MetaFiles[FilePath] = ParserObject\r
return ParserObject\r
\r
self.InfBuildOptionSection = InfBuildOptionsObject()\r
self.InfLibraryClassSection = InfLibraryClassObject()\r
self.InfPackageSection = InfPackageObject()\r
- self.InfPcdSection = InfPcdObject(self.MetaFiles.keys()[0])\r
+ self.InfPcdSection = InfPcdObject(list(self.MetaFiles.keys())[0])\r
self.InfSourcesSection = InfSourcesObject()\r
self.InfUserExtensionSection = InfUserExtensionObject()\r
self.InfProtocolSection = InfProtocolObject()\r
Arch = Match.groups(1)[0].upper()\r
ArchList.append(Arch)\r
CommentSoFar = ''\r
- for Index in xrange(1, len(List)):\r
+ for Index in range(1, len(List)):\r
Result = ParseComment(List[Index], DT.ALL_USAGE_TOKENS, TokenDict, [], False)\r
Usage = Result[0]\r
Type = Result[1]\r
'''\r
DecPomAlignment\r
'''\r
-from __future__ import print_function\r
\r
##\r
# Import Modules\r
#\r
import locale\r
import sys\r
-encoding = locale.getdefaultlocale()[1]\r
-if encoding:\r
- reload(sys)\r
- sys.setdefaultencoding(encoding)\r
from Core import FileHook\r
import os.path\r
from sys import platform\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
\r
-from __future__ import print_function\r
import os\r
import unittest\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
\r
-from __future__ import print_function\r
import os\r
#import Object.Parser.InfObject as InfObject\r
from Object.Parser.InfCommonObject import CurrentLine\r
CurrentKey = ''\r
PreMap = None\r
Map = None\r
- FileContent = ConvertSpecialChar(open(IniFile, 'rb').readlines())\r
+ FileContent = ConvertSpecialChar(open(IniFile, 'r').readlines())\r
LastIndex = 0\r
for Index in range(0, len(FileContent)):\r
LastIndex = Index\r
if SecondByte != 0:\r
return None\r
\r
- if FirstByte not in xrange(0x20, 0x7F):\r
+ if FirstByte not in range(0x20, 0x7F):\r
return None\r
TransferedStr += ('%c')%FirstByte\r
Index = Index + 2\r
projects / mirror_edk2.git / commitdiff