BaseTools/Common/Misc: move private functions

These 2 functions are only used internally.  move them to the smallest
scope and use them.

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>

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 8e4217a4f6e5b6f661b008b46af5e437e2cdf832..c547c2f8e43a27cdff66faf2b7c0960a324664c3 100644 (file)
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -566,32 +566,6 @@ def RealPath(File, Dir='', OverrideDir=''):
         NewFile = GlobalData.gAllFiles[NewFile]\r
     return NewFile\r
 \r
-def RealPath2(File, Dir='', OverrideDir=''):\r
-    NewFile = None\r
-    if OverrideDir:\r
-        NewFile = GlobalData.gAllFiles[os.path.normpath(os.path.join(OverrideDir, File))]\r
-        if NewFile:\r
-            if OverrideDir[-1] == os.path.sep:\r
-                return NewFile[len(OverrideDir):], NewFile[0:len(OverrideDir)]\r
-            else:\r
-                return NewFile[len(OverrideDir) + 1:], NewFile[0:len(OverrideDir)]\r
-    if GlobalData.gAllFiles:\r
-        NewFile = GlobalData.gAllFiles[os.path.normpath(os.path.join(Dir, File))]\r
-    if not NewFile:\r
-        NewFile = os.path.normpath(os.path.join(Dir, File))\r
-        if not os.path.exists(NewFile):\r
-            return None, None\r
-    if NewFile:\r
-        if Dir:\r
-            if Dir[-1] == os.path.sep:\r
-                return NewFile[len(Dir):], NewFile[0:len(Dir)]\r
-            else:\r
-                return NewFile[len(Dir) + 1:], NewFile[0:len(Dir)]\r
-        else:\r
-            return NewFile, ''\r
-\r
-    return None, None\r
-\r
 ## Get GUID value from given packages\r
 #\r
 #   @param      CName           The CName of the GUID\r
@@ -1189,27 +1163,27 @@ def AnalyzePcdExpression(Setting):
             FieldList[i] = ch.replace(RanStr,'\\\\')\r
     return FieldList\r
 \r
-def ParseDevPathValue (Value):\r
-    if '\\' in Value:\r
-        Value.replace('\\', '/').replace(' ', '')\r
+def ParseFieldValue (Value):\r
+    def ParseDevPathValue (Value):\r
+        if '\\' in Value:\r
+            Value.replace('\\', '/').replace(' ', '')\r
 \r
-    Cmd = 'DevicePath ' + '"' + Value + '"'\r
-    try:\r
-        p = subprocess.Popen(Cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
-        out, err = p.communicate()\r
-    except Exception as X:\r
-        raise BadExpression("DevicePath: %s" % (str(X)) )\r
-    finally:\r
-        subprocess._cleanup()\r
-        p.stdout.close()\r
-        p.stderr.close()\r
-    if err:\r
-        raise BadExpression("DevicePath: %s" % str(err))\r
-    Size = len(out.split())\r
-    out = ','.join(out.split())\r
-    return '{' + out + '}', Size\r
+        Cmd = 'DevicePath ' + '"' + Value + '"'\r
+        try:\r
+            p = subprocess.Popen(Cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
+            out, err = p.communicate()\r
+        except Exception as X:\r
+            raise BadExpression("DevicePath: %s" % (str(X)) )\r
+        finally:\r
+            subprocess._cleanup()\r
+            p.stdout.close()\r
+            p.stderr.close()\r
+        if err:\r
+            raise BadExpression("DevicePath: %s" % str(err))\r
+        Size = len(out.split())\r
+        out = ','.join(out.split())\r
+        return '{' + out + '}', Size\r
 \r
-def ParseFieldValue (Value):\r
     if "{CODE(" in Value:\r
         return Value, len(Value.split(","))\r
     if isinstance(Value, type(0)):\r
@@ -1625,6 +1599,32 @@ class PathClass(object):
         return os.stat(self.Path)[8]\r
 \r
     def Validate(self, Type='', CaseSensitive=True):\r
+        def RealPath2(File, Dir='', OverrideDir=''):\r
+            NewFile = None\r
+            if OverrideDir:\r
+                NewFile = GlobalData.gAllFiles[os.path.normpath(os.path.join(OverrideDir, File))]\r
+                if NewFile:\r
+                    if OverrideDir[-1] == os.path.sep:\r
+                        return NewFile[len(OverrideDir):], NewFile[0:len(OverrideDir)]\r
+                    else:\r
+                        return NewFile[len(OverrideDir) + 1:], NewFile[0:len(OverrideDir)]\r
+            if GlobalData.gAllFiles:\r
+                NewFile = GlobalData.gAllFiles[os.path.normpath(os.path.join(Dir, File))]\r
+            if not NewFile:\r
+                NewFile = os.path.normpath(os.path.join(Dir, File))\r
+                if not os.path.exists(NewFile):\r
+                    return None, None\r
+            if NewFile:\r
+                if Dir:\r
+                    if Dir[-1] == os.path.sep:\r
+                        return NewFile[len(Dir):], NewFile[0:len(Dir)]\r
+                    else:\r
+                        return NewFile[len(Dir) + 1:], NewFile[0:len(Dir)]\r
+                else:\r
+                    return NewFile, ''\r
+\r
+            return None, None\r
+\r
         if GlobalData.gCaseInsensitive:\r
             CaseSensitive = False\r
         if Type and Type.lower() != self.Type:\r