Revert BaseTools: PYTHON3 migration

This reverts commit 6693f359b3c213513c5096a06c6f67244a44dc52..
678f85131238622e576705117e299d81cff755c9.

Python3 migration is the fundamental change. It requires every developer
to install Python3. Before this migration, the well communication and wide
verification must be done. But now, most people is not aware of this change,
and not try it. So, Python3 migration is reverted and be moved to edk2-staging
Python3 branch for the edk2 user evaluation.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py b/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py
index 94c004902f..4deeee01a5 100644
--- a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py
+++ b/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py
@@ -12,11 +12,12 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 

+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

+import plugins.EdkPlugins.edk2.model.baseobject as baseobject

+import plugins.EdkPlugins.edk2.model.doxygengen as 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',

@@ -37,7 +38,7 @@ def parseCmdArgs():
                       help='Specify the absolute path of doxygen tools installation. For example: C:\\Program Files\\doxygen\bin\doxygen.exe')

     parser.add_option('-o', '--output', action='store', dest='OutputPath',

                       help='Specify the document output path. For example: c:\\docoutput')

-    parser.add_option('-a', '--arch', action='store', dest='Arch', choices=list(gArchMarcoDict.keys()),

+    parser.add_option('-a', '--arch', action='store', dest='Arch', choices=gArchMarcoDict.keys(),

                       help='Specify the architecture used in preprocess package\'s source. For example: -a IA32_MSFT')

     parser.add_option('-m', '--mode', action='store', dest='DocumentMode', choices=['CHM', 'HTML'],

                       help='Specify the document mode from : CHM or HTML')