##\r
# Import Modules\r
#\r
+from __future__ import absolute_import\r
import Common.EdkLogger as EdkLogger\r
-import StringIO\r
from Common.BuildToolError import *\r
-from Common.String import GetLineNo\r
+from Common.StringUtils import GetLineNo\r
from Common.Misc import PathClass\r
from Common.LongFilePathSupport import LongFilePath\r
import re\r
import os\r
from Common.GlobalData import gIdentifierPattern\r
-from UniClassObject import StripComments\r
+from .UniClassObject import StripComments\r
\r
IMAGE_TOKEN = re.compile('IMAGE_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE)\r
\r
for File in FileList:\r
if File is None:\r
EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'No Image definition file is given.')\r
- self.File = File\r
\r
try:\r
IdfFile = open(LongFilePath(File.Path), mode='r')\r