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>

9 files changed, 26 insertions, 26 deletions

diff --git a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py b/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py
index e404a07cd7..5c65842a72 100644
--- 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

 from optparse import OptionParser

 

-from .plugins.EdkPlugins.edk2.model import baseobject

-from .plugins.EdkPlugins.edk2.model import doxygengen

+from plugins.EdkPlugins.edk2.model import baseobject

+from plugins.EdkPlugins.edk2.model import doxygengen

 

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

                   'IA32_MSFT': 'MDE_CPU_IA32 _MSC_EXTENSIONS',

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py
index ae47ff1344..a510808842 100644
--- 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>')

             endIndex += 1

             if self.mIsSort:

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

+                self.mSubPages.sort(key=lambda x: x.mName.lower())

             for page in self.mSubPages:

                 self.mText.insert(endIndex, '<li>\subpage %s \"%s\" </li>' % (page.mTag, page.mName))

                 endIndex += 1

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py
index 6e6f3f4b97..bac2f5e2e6 100644
--- 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

 

         """

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

+        if len(args) == 0: return object.__new__(cls)

         filename = args[0]

         parent   = None

         if len(args) > 1:

@@ -33,7 +33,7 @@ class BaseINIFile(object):
 

         key = os.path.normpath(filename)

         if key not in cls._objs.keys():

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

+            cls._objs[key] = object.__new__(cls)

 

         if parent is not None:

             cls._objs[key].AddParent(parent)

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
index 0159bd5269..7b47fd76b9 100644
--- 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,

 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-from ...basemodel import ini

-from ...edk2.model import dsc

-from ...edk2.model import inf

-from ...edk2.model import dec

+from plugins.EdkPlugins.basemodel import ini

+from plugins.EdkPlugins.edk2.model import dsc

+from plugins.EdkPlugins.edk2.model import inf

+from plugins.EdkPlugins.edk2.model import dec

 import os

-from ...basemodel.message import *

+from plugins.EdkPlugins.basemodel.message import *

 

 class SurfaceObject(object):

     _objs = {}

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

 

         """

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

+        obj = object.__new__(cls)

         if "None" not in cls._objs:

             cls._objs["None"] = []

         cls._objs["None"].append(obj)

@@ -846,7 +846,7 @@ class SurfaceItem(object):
                 ErrorMsg("%s item is duplicated defined in packages: %s and %s" %

                          (name, parent.GetFilename(), cls._objs[name].GetParent().GetFilename()))

                 return None

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

+            obj = object.__new__(cls)

             cls._objs[name] = obj

             return obj

         elif issubclass(parent.__class__, Module):

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dec.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dec.py
index 3d210f72ac..568076547b 100644
--- 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.

 #

 

-from ...basemodel import ini

+from plugins.EdkPlugins.basemodel import ini

 import re, os

-from ...basemodel.message import *

+from plugins.EdkPlugins.basemodel.message import *

 

 class DECFile(ini.BaseINIFile):

 

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

    The action classes are shared by GUI and command line tools.

 """

-from ...basemodel import doxygen

+from plugins.EdkPlugins.basemodel import doxygen

 import os

 try:

     import wx

@@ -24,9 +24,9 @@ try:
 except:

     gInGui = False

 import re

-from ...edk2.model import inf

-from ...edk2.model import dec

-from ...basemodel.message import *

+from plugins.EdkPlugins.edk2.model import inf

+from plugins.EdkPlugins.edk2.model import dec

+from plugins.EdkPlugins.basemodel.message import *

 

 _ignore_dir = ['.svn', '_svn', 'cvs']

 _inf_key_description_mapping_table = {

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 3a862a92ea..279b7fb8d4 100644
--- 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,

 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-from ...basemodel import doxygen

+from plugins.EdkPlugins.basemodel import doxygen

 import os

 try:

     import wx

@@ -21,9 +21,9 @@ try:
 except:

     gInGui = False

 import re

-from ...edk2.model import inf

-from ...edk2.model import dec

-from ...basemodel.message import *

+from plugins.EdkPlugins.edk2.model import inf

+from plugins.EdkPlugins.edk2.model import dec

+from plugins.EdkPlugins.basemodel.message import *

 

 _ignore_dir = ['.svn', '_svn', 'cvs']

 _inf_key_description_mapping_table = {

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dsc.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/dsc.py
index 6f59e566b8..9c57f6f41f 100644
--- 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.

 #

 

-from ...basemodel import ini

+from plugins.EdkPlugins.basemodel import ini

 import re, os

-from ...basemodel.message import *

+from plugins.EdkPlugins.basemodel.message import *

 

 class DSCFile(ini.BaseINIFile):

     def GetSectionInstance(self, parent, name, isCombined=False):

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
index cf2e49d3af..c5f03841d3 100644
--- 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.

 #

 

-from ...basemodel import ini

+from plugins.EdkPlugins.basemodel import ini

 import re, os

-from ...basemodel.message import *

+from plugins.EdkPlugins.basemodel.message import *

 

 class INFFile(ini.BaseINIFile):

     _libobjs = {}