BaseTools: fix imports

1 - Some of these imports are cascaded from another file. Import them locally.
2 - Some of these imports are not used. Remove them.
3 - Some of these were missing the namespace used to import them.

These changes facilitate optimization of BaseTools:
https://bugzilla.tianocore.org/show_bug.cgi?id=42

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: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index de0b166030..d54e4bd031 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -1101,7 +1101,7 @@ class FdfParser:
     def _GetNextGuid(self):

         if not self._GetNextToken():

             return False

-        if gGuidPattern.match(self._Token) is not None:

+        if GlobalData.gGuidPattern.match(self._Token) is not None:

             return True

         else:

             self._UndoToken()

@@ -1169,7 +1169,7 @@ class FdfParser:
     def _GetNextHexNumber(self):

         if not self._GetNextToken():

             return False

-        if gHexPatternAll.match(self._Token):

+        if GlobalData.gHexPatternAll.match(self._Token):

             return True

         else:

             self._UndoToken()