moved "get_external_program_location" to the "locations" module

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@1111 bbaffbd6-741e-11dd-a85d-61de82d9cad9

src/pycam/Utils/__init__.py

@@ -21,9 +21,8 @@ along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 __all__ = ["iterators", "polynomials", "ProgressCounter", "threading",
-        "get_platform", "get_external_program_location", "URIHandler",
-        "PLATFORM_WINDOWS", "PLATFORM_MACOS", "PLATFORM_LINUX",
-        "PLATFORM_UNKNOWN"]
+        "get_platform", "URIHandler", "PLATFORM_WINDOWS", "PLATFORM_MACOS",
+        "PLATFORM_LINUX", "PLATFORM_UNKNOWN"]
 
 import sys
 import os
@@ -193,50 +192,6 @@ def get_all_ips():
     return filtered_result
 
 
-def get_external_program_location(key):
-    extensions = ["", ".exe"]
-    potential_names = ["%s%s" % (key, ext) for ext in extensions]
-    windows_program_directories = {'inkscape': ['Inkscape'],
-            'pstoedit': ['pstoedit']}
-    # check the windows path via win32api
-    try:
-        import win32api
-        location = win32api.FindExecutable(key)[1]
-        if location:
-            return location
-    except Exception:
-        # Wildcard (non-system exiting) exeception to match "ImportError" and
-        # "pywintypes.error" (for "not found").
-        pass
-    # go through the PATH environment variable
-    if "PATH" in os.environ:
-        path_env = os.environ["PATH"]
-        for one_dir in path_env.split(os.pathsep):
-            for basename in potential_names:
-                location = os.path.join(one_dir, basename)
-                if os.path.isfile(location):
-                    return location
-    # do a manual scan in the programs directory (only for windows)
-    program_dirs = ["C:\\Program Files", "C:\\Programme"]
-    try:
-        from win32com.shell import shellcon, shell            
-        # The frozen application somehow dows not provide this setting.
-        program_dirs.insert(0, shell.SHGetFolderPath(0,
-                shellcon.CSIDL_PROGRAM_FILES, 0, 0))
-    except ImportError:
-        # no other options for non-windows systems
-        pass
-    # scan the program directory
-    for program_dir in program_dirs:
-        for sub_dir in windows_program_directories[key]:
-            for basename in potential_names:
-                location = os.path.join(program_dir, sub_dir, basename)
-                if os.path.isfile(location):
-                    return location
-    # nothing found
-    return None
-
-
 class ProgressCounter(object):
 
     def __init__(self, max_value, update_callback):

src/pycam/Utils/locations.py

@@ -93,3 +93,46 @@ def get_font_dir():
                     ":".join(FONT_DIRS_FALLBACK))
             return None
 
+def get_external_program_location(key):
+    extensions = ["", ".exe"]
+    potential_names = ["%s%s" % (key, ext) for ext in extensions]
+    windows_program_directories = {'inkscape': ['Inkscape'],
+            'pstoedit': ['pstoedit']}
+    # check the windows path via win32api
+    try:
+        import win32api
+        location = win32api.FindExecutable(key)[1]
+        if location:
+            return location
+    except Exception:
+        # Wildcard (non-system exiting) exeception to match "ImportError" and
+        # "pywintypes.error" (for "not found").
+        pass
+    # go through the PATH environment variable
+    if "PATH" in os.environ:
+        path_env = os.environ["PATH"]
+        for one_dir in path_env.split(os.pathsep):
+            for basename in potential_names:
+                location = os.path.join(one_dir, basename)
+                if os.path.isfile(location):
+                    return location
+    # do a manual scan in the programs directory (only for windows)
+    program_dirs = ["C:\\Program Files", "C:\\Programme"]
+    try:
+        from win32com.shell import shellcon, shell            
+        # The frozen application somehow dows not provide this setting.
+        program_dirs.insert(0, shell.SHGetFolderPath(0,
+                shellcon.CSIDL_PROGRAM_FILES, 0, 0))
+    except ImportError:
+        # no other options for non-windows systems
+        pass
+    # scan the program directory
+    for program_dir in program_dirs:
+        for sub_dir in windows_program_directories[key]:
+            for basename in potential_names:
+                location = os.path.join(program_dir, sub_dir, basename)
+                if os.path.isfile(location):
+                    return location
+    # nothing found
+    return None
+