Revert BaseTools: PYTHON3 migration

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

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
index f123f6a915ae94034a51a3de5ec7de491774885f..b49c87c8bdab3353d3ef76ae300b6bcf24856914 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
-from ...basemodel import ini as ini\r
-from ..model import dsc as dsc\r
-from ..model import inf as inf\r
-from ..model import dec as dec\r
+import plugins.EdkPlugins.basemodel.ini as ini\r
+import plugins.EdkPlugins.edk2.model.dsc as dsc\r
+import plugins.EdkPlugins.edk2.model.inf as inf\r
+import plugins.EdkPlugins.edk2.model.dec as dec\r
 import os\r
-from ...basemodel.message import *\r
+from plugins.EdkPlugins.basemodel.message import *\r
 \r
 class SurfaceObject(object):\r
     _objs = {}\r
@@ -25,7 +25,7 @@ class SurfaceObject(object):
         @return: instance of this class\r
 \r
         """\r
-        obj = object.__new__(cls)\r
+        obj = object.__new__(cls, *args, **kwargs)\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
-            obj = object.__new__(cls)\r
+            obj = object.__new__(cls, *args, **kwargs)\r
             cls._objs[name] = obj\r
             return obj\r
         elif issubclass(parent.__class__, Module):\r