* pycompile:

  - --exclude now works with private dirs
  - use /usr/bin/pythonX.Y rather than pythonX.Y (to avoid /usr/local
    interpreters)
  

debian/changelog

@@ -6,7 +6,11 @@ python-defaults (2.6.6-11) UNRELEASED; urgency=low
     - replace a file with a symlink also if there's a matching one in
       pyshared directory already
     - add support for DH_OPTIONS env. variable
-  * pycompile: --exclude now works with private dirs
+  * pycompile:
+    - --exclude now works with private dirs
+    - use /usr/bin/pythonX.Y rather than pythonX.Y (to avoid /usr/local
+      interpreters)
+    
 
  -- Piotr Ożarowski <piotr@debian.org>  Sat, 15 Jan 2011 21:14:38 +0100
 

pycompile

@@ -125,11 +125,12 @@ def get_exclude_patterns_from_dir(name='/usr/share/python/bcep/'):
 
 def get_exclude_patterns(directory='/', patterns=None, versions=None):
     """Return patterns for files that shouldn't be compiled in given dir."""
+    if versions is not None:
+        # make sure it's a set (debsorted returns a list)
+        versions = set(versions)
     if patterns:
         if versions is None:
             versions = set(SUPPORTED)
-        else:
-            versions = set(versions)
         patterns = [('re', versions, directory, i) for i in patterns]
     else:
         patterns = []
@@ -171,7 +172,7 @@ def filter_files(files, e_patterns, compile_versions):
 def py_compile(version, optimize, workers):
     if not isinstance(version, basestring):
         version = vrepr(version)
-    cmd = "python%s%s -m py_compile -" \
+    cmd = "/usr/bin/python%s%s -m py_compile -" \
         % (version, '' if (__debug__ or not optimize) else ' -O')
     process = Popen(cmd, bufsize=1, shell=True,
                     stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)