Revert BaseTools: PYTHON3 migration

[mirror_edk2.git] / BaseTools / Scripts / PackageDocumentTools / packagedocapp.pyw

diff --git a/BaseTools/Scripts/PackageDocumentTools/packagedocapp.pyw b/BaseTools/Scripts/PackageDocumentTools/packagedocapp.pyw
index f81ecfdc4cda849b485ebea2ce1bf14abeb7e7c2..28f6f9bf5cceaf941ee0feb46a187349c48e7e9b 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/packagedocapp.pyw
+++ b/BaseTools/Scripts/PackageDocumentTools/packagedocapp.pyw
@@ -18,8 +18,8 @@ import os, sys, wx, logging
 import wx.stc\r
 import wx.lib.newevent\r
 import wx.lib.agw.genericmessagedialog as GMD\r
-from plugins.EdkPlugins.edk2.model import baseobject\r
-from plugins.EdkPlugins.edk2.model import doxygengen\r
+import plugins.EdkPlugins.edk2.model.baseobject as baseobject\r
+import plugins.EdkPlugins.edk2.model.doxygengen as doxygengen\r
 \r
 if hasattr(sys, "frozen"):\r
     appPath = os.path.abspath(os.path.dirname(sys.executable))\r
@@ -42,7 +42,7 @@ class PackageDocApp(wx.App):
 \r
         frame.Show(True)\r
 \r
-        self.Bind(EVT_APP_CALLBACK, self.OnAppCallBack)\r
+        EVT_APP_CALLBACK( self, self.OnAppCallBack)\r
         return True\r
 \r
     def GetLogger(self):\r
@@ -60,13 +60,13 @@ class PackageDocApp(wx.App):
 \r
 class PackageDocMainFrame(wx.Frame):\r
     def __init__(self, parent, title):\r
-        wx.Frame.__init__(self, parent, -1, title, size=(550, 350), style=wx.MINIMIZE_BOX|wx.SYSTEM_MENU|wx.CAPTION|wx.CLOSE_BOX )\r
+        wx.Frame.__init__(self, parent, -1, title, size=(550, 290), style=wx.MINIMIZE_BOX|wx.SYSTEM_MENU|wx.CAPTION|wx.CLOSE_BOX )\r
 \r
         panel = wx.Panel(self)\r
         sizer = wx.BoxSizer(wx.VERTICAL)\r
 \r
         subsizer = wx.GridBagSizer(5, 10)\r
-        subsizer.AddGrowableCol(0)\r
+        subsizer.AddGrowableCol(1)\r
         subsizer.Add(wx.StaticText(panel, -1, "Workspace Location : "), (0, 0), flag=wx.ALIGN_CENTER_VERTICAL)\r
         self._workspacePathCtrl = wx.ComboBox(panel, -1)\r
         list = self.GetConfigure("WorkspacePath")\r
@@ -76,9 +76,9 @@ class PackageDocMainFrame(wx.Frame):
             self._workspacePathCtrl.SetValue(list[len(list) - 1])\r
 \r
         subsizer.Add(self._workspacePathCtrl, (0, 1), flag=wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)\r
-        self._workspacePathBt = wx.BitmapButton(panel, -1, bitmap=wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN))\r
+        self._workspacePathBt = wx.BitmapButton(panel, -1, bitmap=wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN))\r
         subsizer.Add(self._workspacePathBt, (0, 2), flag=wx.ALIGN_CENTER_VERTICAL)\r
-        self.Bind(wx.EVT_BUTTON, self.OnBrowsePath, self._workspacePathBt)\r
+        wx.EVT_BUTTON(self._workspacePathBt, self._workspacePathBt.GetId(), self.OnBrowsePath)\r
 \r
         subsizer.Add(wx.StaticText(panel, -1, "Package DEC Location : "), (1, 0), flag=wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)\r
         self._packagePathCtrl = wx.ComboBox(panel, -1)\r
@@ -88,9 +88,9 @@ class PackageDocMainFrame(wx.Frame):
                 self._packagePathCtrl.Append(item)\r
             self._packagePathCtrl.SetValue(list[len(list) - 1])\r
         subsizer.Add(self._packagePathCtrl, (1, 1), flag=wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)\r
-        self._packagePathBt = wx.BitmapButton(panel, -1, bitmap=wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN))\r
+        self._packagePathBt = wx.BitmapButton(panel, -1, bitmap=wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN))\r
         subsizer.Add(self._packagePathBt, (1, 2), flag=wx.ALIGN_CENTER_VERTICAL)\r
-        self.Bind(wx.EVT_BUTTON, self.OnBrowsePath, self._packagePathBt)\r
+        wx.EVT_BUTTON(self._packagePathBt, self._packagePathBt.GetId(), self.OnBrowsePath)\r
 \r
         subsizer.Add(wx.StaticText(panel, -1, "Doxygen Tool Location : "), (2, 0), flag=wx.ALIGN_CENTER_VERTICAL)\r
         self._doxygenPathCtrl = wx.TextCtrl(panel, -1)\r
@@ -103,10 +103,10 @@ class PackageDocMainFrame(wx.Frame):
             else:\r
                 self._doxygenPathCtrl.SetValue('/usr/bin/doxygen')\r
 \r
-        self._doxygenPathBt = wx.BitmapButton(panel, -1, bitmap=wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN))\r
+        self._doxygenPathBt = wx.BitmapButton(panel, -1, bitmap=wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN))\r
         subsizer.Add(self._doxygenPathCtrl, (2, 1), flag=wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)\r
         subsizer.Add(self._doxygenPathBt, (2, 2), flag=wx.ALIGN_CENTER_VERTICAL)\r
-        self.Bind(wx.EVT_BUTTON, self.OnBrowsePath, self._doxygenPathBt)\r
+        wx.EVT_BUTTON(self._doxygenPathBt, self._doxygenPathBt.GetId(), self.OnBrowsePath)\r
 \r
         subsizer.Add(wx.StaticText(panel, -1, "CHM Tool Location : "), (3, 0), flag=wx.ALIGN_CENTER_VERTICAL)\r
         self._chmPathCtrl = wx.TextCtrl(panel, -1)\r
@@ -116,10 +116,10 @@ class PackageDocMainFrame(wx.Frame):
         else:\r
             self._chmPathCtrl.SetValue('C:\\Program Files\\HTML Help Workshop\\hhc.exe')\r
 \r
-        self._chmPathBt = wx.BitmapButton(panel, -1, bitmap=wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN))\r
+        self._chmPathBt = wx.BitmapButton(panel, -1, bitmap=wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN))\r
         subsizer.Add(self._chmPathCtrl, (3, 1), flag=wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)\r
         subsizer.Add(self._chmPathBt, (3, 2), flag=wx.ALIGN_CENTER_VERTICAL)\r
-        self.Bind(wx.EVT_BUTTON, self.OnBrowsePath, self._chmPathBt)\r
+        wx.EVT_BUTTON(self._chmPathBt, self._chmPathBt.GetId(), self.OnBrowsePath)\r
 \r
         subsizer.Add(wx.StaticText(panel, -1, "Output Location : "), (4, 0), flag=wx.ALIGN_CENTER_VERTICAL)\r
         self._outputPathCtrl = wx.ComboBox(panel, -1)\r
@@ -130,9 +130,9 @@ class PackageDocMainFrame(wx.Frame):
             self._outputPathCtrl.SetValue(list[len(list) - 1])\r
 \r
         subsizer.Add(self._outputPathCtrl, (4, 1), flag=wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)\r
-        self._outputPathBt = wx.BitmapButton(panel, -1, bitmap=wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN))\r
+        self._outputPathBt = wx.BitmapButton(panel, -1, bitmap=wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN))\r
         subsizer.Add(self._outputPathBt, (4, 2), flag=wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)\r
-        self.Bind(wx.EVT_BUTTON, self.OnBrowsePath, self._outputPathBt)\r
+        wx.EVT_BUTTON(self._outputPathBt, self._outputPathBt.GetId(), self.OnBrowsePath)\r
 \r
         subsizer.Add(wx.StaticText(panel, -1, "Architecture Specified : "), (5, 0), flag=wx.ALIGN_CENTER_VERTICAL)\r
         self._archCtrl = wx.ComboBox(panel, -1, value='ALL', choices=['ALL', 'IA32/MSFT', 'IA32/GNU', 'X64/INTEL', 'X64/GNU', 'IPF/MSFT', 'IPF/GNU', 'EBC/INTEL'],\r
@@ -164,7 +164,7 @@ class PackageDocMainFrame(wx.Frame):
     def SaveConfigure(self, name, value):\r
         if value ==None or len(value) == 0:\r
             return\r
-        config = wx.ConfigBase.Get()\r
+        config = wx.ConfigBase_Get()\r
         oldvalues = config.Read(name, '').split(';')\r
         if len(oldvalues) >= 10:\r
             oldvalues.remove(oldvalues[0])\r
@@ -177,7 +177,7 @@ class PackageDocMainFrame(wx.Frame):
         config.Write(name, ';'.join(oldvalues))\r
 \r
     def GetConfigure(self, name):\r
-        config = wx.ConfigBase.Get()\r
+        config = wx.ConfigBase_Get()\r
         values = config.Read(name, '').split(';')\r
         list = []\r
         for item in values:\r
@@ -416,10 +416,10 @@ class ProgressDialog(wx.Dialog):
         logging.getLogger('').addHandler(self._loghandle)\r
         logging.getLogger('app').addHandler(self._loghandle)\r
 \r
-        self.Bind(wx.EVT_BUTTON, self.OnButtonClose, self._closeBt)\r
-        self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateCloseButton)\r
-        self.Bind(wx.EVT_BUTTON, self.OnGotoOutput, self._gotoOuputBt)\r
-        self.Bind(EVT_LOG, self.OnPostLog)\r
+        wx.EVT_BUTTON(self._closeBt, self._closeBt.GetId(), self.OnButtonClose)\r
+        wx.EVT_UPDATE_UI(self, self._closeBt.GetId(), self.OnUpdateCloseButton)\r
+        wx.EVT_BUTTON(self._gotoOuputBt, self._gotoOuputBt.GetId(), self.OnGotoOutput)\r
+        EVT_LOG(self, self.OnPostLog)\r
 \r
         self._process     = None\r
         self._pid         = None\r
@@ -720,7 +720,7 @@ class ProgressDialog(wx.Dialog):
             lines = f.readlines()\r
             f.close()\r
             bfound = False\r
-            for index in range(len(lines)):\r
+            for index in xrange(len(lines)):\r
                 if lines[index].find('<a class="el" href="files.html" target="basefrm">File List</a>') != -1:\r
                     lines[index] = "<!-- %s" % lines[index]\r
                     bfound = True\r
@@ -745,7 +745,7 @@ class ProgressDialog(wx.Dialog):
             lines = f.readlines()\r
             f.close()\r
             bfound = False\r
-            for index in range(len(lines)):\r
+            for index in xrange(len(lines)):\r
                 if not bfound:\r
                     if lines[index].find('<param name="Local" value="files.html">') != -1:\r
                         lines[index] = '<!-- %s' % lines[index]\r
@@ -969,7 +969,7 @@ class ProgressDialog(wx.Dialog):
             fd = open(path, 'r')\r
             text = fd.read()\r
             fd.close()\r
-        except Exception as e:\r
+        except Exception, e:\r
             self.LogMessage ("   <<<Fail to open file %s" % path)\r
             return\r
         text = text.replace ('.s.dox', '.s')\r
@@ -982,7 +982,7 @@ class ProgressDialog(wx.Dialog):
             fd = open(path, 'w')\r
             fd.write(text)\r
             fd.close()\r
-        except Exception as e:\r
+        except Exception, e:\r
             self.LogMessage ("    <<<Fail to fixup file %s" % path)\r
             return\r
         self.LogMessage('    >>> Finish to fixup .dox postfix for file %s \n' % path)\r
@@ -993,7 +993,7 @@ class ProgressDialog(wx.Dialog):
             fd = open(path, 'r')\r
             lines = fd.readlines()\r
             fd.close()\r
-        except Exception as e:\r
+        except Exception, e:\r
             self.LogMessage ("   <<<Fail to open file %s" % path)\r
             return\r
         for line in lines:\r
@@ -1004,7 +1004,7 @@ class ProgressDialog(wx.Dialog):
             fd = open(path, 'w')\r
             fd.write("".join(lines))\r
             fd.close()\r
-        except Exception as e:\r
+        except Exception, e:\r
             self.LogMessage ("    <<<Fail to fixup file %s" % path)\r
             return\r
         self.LogMessage('    >>> Finish to fixup .decdoxygen postfix for file %s \n' % path)\r