Merge lp:~brian.curtin/ubuntuone-dev-tools/prefer-path into lp:ubuntuone-dev-tools

[Brian Curtin]

Check on the Path for python.exe before looking in the registry, to allow buildout-based setups to work with the proper Python setup. Additionally, for the buildout setups, check for scripts next to python.exe before trying the traditional Scripts/ folder.

u1lint should prefer the Python on the path and fall back to checking the registry. When running within a buildout, the copy of Python that gets run is on the Path and not in the registry, so the wrong one ends up being found.

Additionally, in that buildout setup, scripts appear next to python.exe rather than in a Scripts folder (like on a regular install). Check first whether the script is beside python.exe and fall back to Scripts/.

(This merge proposal includes a small correction from pushing a bad version of the file - os.path.join was left out of line 87 of u1lint)

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'bin/u1lint'
--- bin/u1lint	2011-12-19 22:37:31 +0000
+++ bin/u1lint	2012-01-20 20:49:30 +0000
@@ -38,7 +38,12 @@
     """Return the path where python was installed."""
     assert(sys.platform == 'win32')
     # To get the correct path of the script we need the installation path
-    # of python. To get the isntallation path we read the registry.
+    # of python. To get the installation path we first check on the path,
+    # then read the registry.
+
+    for path in os.getenv("Path", "").split(";"):
+        if os.path.exists(os.path.join(path, "python.exe")):
+            return path 
 
     # pylint: disable=F0401
     import _winreg
@@ -78,7 +83,11 @@
     if sys.platform == 'win32':
         if python_path is None:
             python_path = find_python_installation_path()
-        return os.path.join(python_path, 'Scripts', script)
+        # In a buildout the scripts go next to python.exe, no Scripts folder.
+        if os.path.exists(os.path.join(python_path, script)):
+            return os.path.join(python_path, script)
+        else:
+            return os.path.join(python_path, 'Scripts', script)
     else:
         # the default is to return the name of the script beacuse we expect it
         # to be executable and in the path.