BaseTools:PackageDocumentTools import lib error occurs.

Steps:
 1. Download edk2 tree
 2. Build BaseTools
 3. Go to edk2\BaseTools\Scripts\PackageDocumentTools
    to run packagedoc_cli.py

An error occurs if relative imports are used when running
a file alone

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py b/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py
index e404a07cd7f18351323ef61d60c9dba9b430a541..5c65842a722eba2933a53ca649ae7c87c59f7f9a 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py
+++ b/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py
@@ -16,8 +16,8 @@ from __future__ import print_function
 import os, sys, logging, traceback, subprocess\r
 from optparse import OptionParser\r
 \r
 import os, sys, logging, traceback, subprocess\r
 from optparse import OptionParser\r
 \r

-from .plugins.EdkPlugins.edk2.model import baseobject\r
-from .plugins.EdkPlugins.edk2.model import doxygengen\r
+from plugins.EdkPlugins.edk2.model import baseobject\r
+from plugins.EdkPlugins.edk2.model import doxygengen\r

 \r
 gArchMarcoDict = {'ALL'      : 'MDE_CPU_IA32 MDE_CPU_X64 MDE_CPU_EBC MDE_CPU_IPF _MSC_EXTENSIONS __GNUC__ __INTEL_COMPILER',\r
                   'IA32_MSFT': 'MDE_CPU_IA32 _MSC_EXTENSIONS',\r
 \r
 gArchMarcoDict = {'ALL'      : 'MDE_CPU_IA32 MDE_CPU_X64 MDE_CPU_EBC MDE_CPU_IPF _MSC_EXTENSIONS __GNUC__ __INTEL_COMPILER',\r
                   'IA32_MSFT': 'MDE_CPU_IA32 _MSC_EXTENSIONS',\r

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py
index ae47ff1344d9650d38023e819e0ac3bb43c12686..a510808842b2c1059c6ffa18a672afdd323f0cfc 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py
@@ -92,7 +92,7 @@ class Page(BaseDoxygeItem):
             self.mText.insert(endIndex, '<ul>')\r
             endIndex += 1\r
             if self.mIsSort:\r
             self.mText.insert(endIndex, '<ul>')\r
             endIndex += 1\r
             if self.mIsSort:\r

-                self.mSubPages.sort(cmp=lambda x, y: cmp(x.mName.lower(), y.mName.lower()))\r
+                self.mSubPages.sort(key=lambda x: x.mName.lower())\r

             for page in self.mSubPages:\r
                 self.mText.insert(endIndex, '<li>\subpage %s \"%s\" </li>' % (page.mTag, page.mName))\r
                 endIndex += 1\r
             for page in self.mSubPages:\r
                 self.mText.insert(endIndex, '<li>\subpage %s \"%s\" </li>' % (page.mTag, page.mName))\r
                 endIndex += 1\r

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py
index 6e6f3f4b97952d572d145980955b40bcab7a36aa..bac2f5e2e65e5ab4a855b0003f50f73e0504b1b2 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py
@@ -25,7 +25,7 @@ class BaseINIFile(object):
         @return: instance of this class\r
 \r
         """\r
         @return: instance of this class\r
 \r
         """\r

-        if len(args) == 0: return object.__new__(cls, *args, **kwargs)\r
+        if len(args) == 0: return object.__new__(cls)\r

         filename = args[0]\r
         parent   = None\r
         if len(args) > 1:\r
         filename = args[0]\r
         parent   = None\r
         if len(args) > 1:\r


@@ -33,7 +33,7 @@ class BaseINIFile(object):
 \r
         key = os.path.normpath(filename)\r
         if key not in cls._objs.keys():\r
 \r
         key = os.path.normpath(filename)\r
         if key not in cls._objs.keys():\r

-            cls._objs[key] = object.__new__(cls, *args, **kwargs)\r
+            cls._objs[key] = object.__new__(cls)\r

 \r
         if parent is not None:\r
             cls._objs[key].AddParent(parent)\r
 \r
         if parent is not None:\r
             cls._objs[key].AddParent(parent)\r

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
index 0159bd526925397639c38ee66a04781c2c93ddc4..7b47fd76b95a6d38fcd3abe356a6a8e2638e9483 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
@@ -10,12 +10,12 @@
 # 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
 # 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 ...basemodel import ini\r
-from ...edk2.model import dsc\r
-from ...edk2.model import inf\r
-from ...edk2.model import dec\r
+from plugins.EdkPlugins.basemodel import ini\r
+from plugins.EdkPlugins.edk2.model import dsc\r
+from plugins.EdkPlugins.edk2.model import inf\r
+from plugins.EdkPlugins.edk2.model import dec\r

 import os\r
 import os\r

-from ...basemodel.message import *\r
+from plugins.EdkPlugins.basemodel.message import *\r

 \r
 class SurfaceObject(object):\r
     _objs = {}\r
 \r
 class SurfaceObject(object):\r
     _objs = {}\r


@@ -25,7 +25,7 @@ class SurfaceObject(object):
         @return: instance of this class\r
 \r
         """\r
         @return: instance of this class\r
 \r
         """\r

-        obj = object.__new__(cls, *args, **kwargs)\r
+        obj = object.__new__(cls)\r

         if "None" not in cls._objs:\r
             cls._objs["None"] = []\r
         cls._objs["None"].append(obj)\r
         if "None" not in cls._objs:\r
             cls._objs["None"] = []\r
         cls._objs["None"].append(obj)\r


@@ -846,7 +846,7 @@ class SurfaceItem(object):
                 ErrorMsg("%s item is duplicated defined in packages: %s and %s" %\r
                          (name, parent.GetFilename(), cls._objs[name].GetParent().GetFilename()))\r
                 return None\r
                 ErrorMsg("%s item is duplicated defined in packages: %s and %s" %\r
                          (name, parent.GetFilename(), cls._objs[name].GetParent().GetFilename()))\r
                 return None\r

-            obj = object.__new__(cls, *args, **kwargs)\r
+            obj = object.__new__(cls)\r

             cls._objs[name] = obj\r
             return obj\r
         elif issubclass(parent.__class__, Module):\r
             cls._objs[name] = obj\r
             return obj\r
         elif issubclass(parent.__class__, Module):\r

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dec.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dec.py
index 3d210f72ac74a0555d2bc9670020fd81fef8239f..568076547b86b176554a5a23953379a4975b04c7 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dec.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dec.py
@@ -11,9 +11,9 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r

-from ...basemodel import ini\r
+from plugins.EdkPlugins.basemodel import ini\r

 import re, os\r
 import re, os\r

-from ...basemodel.message import *\r
+from plugins.EdkPlugins.basemodel.message import *\r

 \r
 class DECFile(ini.BaseINIFile):\r
 \r
 \r
 class DECFile(ini.BaseINIFile):\r
 \r

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
index 9c299fbfc50ae60e4749aedb342037a3dcaaf223..e31df262bc9f71898402adf60473afca6704f03c 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

-from ...basemodel import doxygen\r
+from plugins.EdkPlugins.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

-from ...edk2.model import inf\r
-from ...edk2.model import dec\r
-from ...basemodel.message import *\r
+from plugins.EdkPlugins.edk2.model import inf\r
+from plugins.EdkPlugins.edk2.model import dec\r
+from plugins.EdkPlugins.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

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py
index 3a862a92eac9909ecf51eb6089a909cfa2ac3ec1..279b7fb8d40eff1e6ebc87bb311c05e26bb41da0 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py
@@ -13,7 +13,7 @@
 # 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
 # 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 ...basemodel import doxygen\r
+from plugins.EdkPlugins.basemodel import doxygen\r

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


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

-from ...edk2.model import inf\r
-from ...edk2.model import dec\r
-from ...basemodel.message import *\r
+from plugins.EdkPlugins.edk2.model import inf\r
+from plugins.EdkPlugins.edk2.model import dec\r
+from plugins.EdkPlugins.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

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dsc.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dsc.py
index 6f59e566b8f6d12f53cac7a1a07f25829cdb13c8..9c57f6f41fbf167eda247176c770209743aa1cd8 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dsc.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dsc.py
@@ -11,9 +11,9 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r

-from ...basemodel import ini\r
+from plugins.EdkPlugins.basemodel import ini\r

 import re, os\r
 import re, os\r

-from ...basemodel.message import *\r
+from plugins.EdkPlugins.basemodel.message import *\r

 \r
 class DSCFile(ini.BaseINIFile):\r
     def GetSectionInstance(self, parent, name, isCombined=False):\r
 \r
 class DSCFile(ini.BaseINIFile):\r
     def GetSectionInstance(self, parent, name, isCombined=False):\r

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
index cf2e49d3afebaf6a7d8d460b9f64340076c8ff90..c5f03841d3c2d2f275d852e191b9a9043640be38 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
@@ -11,9 +11,9 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r

-from ...basemodel import ini\r
+from plugins.EdkPlugins.basemodel import ini\r

 import re, os\r
 import re, os\r

-from ...basemodel.message import *\r
+from plugins.EdkPlugins.basemodel.message import *\r

 \r
 class INFFile(ini.BaseINIFile):\r
     _libobjs = {}\r
 \r
 class INFFile(ini.BaseINIFile):\r
     _libobjs = {}\r