BaseTools/Scripts: Porting PackageDocumentTools code to use Python3

[mirror_edk2.git] / BaseTools / Scripts / PackageDocumentTools / plugins / EdkPlugins / edk2 / model / doxygengen.py

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
index c22d362ff3e12acba99a54c172162c604270d480..25b6a613b14be65dbb22d79b44bb4b50667fd6e7 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
@@ -16,7 +16,7 @@
 """This file produce action class to generate doxygen document for edk2 codebase.\r
    The action classes are shared by GUI and command line tools.\r
 """\r
 """This file produce action class to generate doxygen document for edk2 codebase.\r
    The action classes are shared by GUI and command line tools.\r
 """\r

-import plugins.EdkPlugins.basemodel.doxygen as doxygen\r
+from ...basemodel import doxygen\r

 import os\r
 try:\r
     import wx\r
 import os\r
 try:\r
     import wx\r


@@ -24,9 +24,9 @@ try:
 except:\r
     gInGui = False\r
 import re\r
 except:\r
     gInGui = False\r
 import re\r

-import plugins.EdkPlugins.edk2.model.inf as inf\r
-import plugins.EdkPlugins.edk2.model.dec as dec\r
-from plugins.EdkPlugins.basemodel.message import *\r
+from ..model import inf\r
+from ..model import dec\r
+from ...basemodel.message import *\r

 \r
 _ignore_dir = ['.svn', '_svn', 'cvs']\r
 _inf_key_description_mapping_table = {\r
 \r
 _ignore_dir = ['.svn', '_svn', 'cvs']\r
 _inf_key_description_mapping_table = {\r


@@ -386,7 +386,7 @@ class PackageDocumentAction(DoxygenAction):
         configFile.AddFile(path)\r
 \r
         no = 0\r
         configFile.AddFile(path)\r
 \r
         no = 0\r

-        for no in xrange(len(lines)):\r
+        for no in range(len(lines)):\r

             if len(lines[no].strip()) == 0:\r
                 continue\r
             if lines[no].strip()[:2] in ['##', '//', '/*', '*/']:\r
             if len(lines[no].strip()) == 0:\r
                 continue\r
             if lines[no].strip()[:2] in ['##', '//', '/*', '*/']:\r


@@ -1000,7 +1000,7 @@ class PackageDocumentAction(DoxygenAction):
         #file = textfile.TextFile(path)\r
 \r
         try:\r
         #file = textfile.TextFile(path)\r
 \r
         try:\r

-            file = open(path, 'rb')\r
+            file = open(path, 'r')\r

         except (IOError, OSError) as msg:\r
             return None\r
 \r
         except (IOError, OSError) as msg:\r
             return None\r
 \r