#\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 list(map(lambda l: l.strip(), String.split(SplitTag, MaxSplit)))\r
+ return 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(lambda x: x.strip(), LineList[1].split(ValueSplitCharacter))\r
+ Value = map(strip, LineList[1].split(ValueSplitCharacter))\r
else:\r
Value = CleanString(LineList[1], CommentCharacter).splitlines()\r
\r
#\r
# Regenerate FileContent\r
#\r
- NewFileContent = NewFileContent + Line + '\n'\r
+ NewFileContent = NewFileContent + Line + '\r\n'\r
\r
if IsFailed:\r
Logger.Error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName, RaiseError=Logger.IS_RAISE_ERROR)\r
# @param String: the source string\r
#\r
def StringArrayLength(String):\r
- if String.startswith('L"'):\r
+ if isinstance(String, unicode):\r
+ return (len(String) + 1) * 2 + 1\r
+ elif String.startswith('L"'):\r
return (len(String) - 3 + 1) * 2\r
elif String.startswith('"'):\r
return (len(String) - 2 + 1)\r
def IsMatchArch(Arch1, Arch2):\r
if 'COMMON' in Arch1 or 'COMMON' in Arch2:\r
return True\r
- if isinstance(Arch1, str) and isinstance(Arch2, str):\r
+ if isinstance(Arch1, basestring) and isinstance(Arch2, basestring):\r
if Arch1 == Arch2:\r
return True\r
\r
- if isinstance(Arch1, str) and isinstance(Arch2, list):\r
+ if isinstance(Arch1, basestring) and isinstance(Arch2, list):\r
return Arch1 in Arch2\r
\r
- if isinstance(Arch2, str) and isinstance(Arch1, list):\r
+ if isinstance(Arch2, basestring) and isinstance(Arch1, list):\r
return Arch2 in Arch1\r
\r
if isinstance(Arch1, list) and isinstance(Arch2, list):\r