Merge lp:~barry/python-distutils-extra/670188-ftbfs into lp:python-distutils-extra

[Barry Warsaw]

Let's try this again, this time against the upstream branch!

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-04 02:37:33 +0000
+++ debian/changelog	2010-11-04 18:44:43 +0000
@@ -1,3 +1,11 @@
+python-distutils-extra (2.22-4) unstable; urgency=low
+
+  * When the environment has $PYTHONPATH in it, we still need to prepend
+    oldcwd in test/auto.py, so that the DistUtilsExtra package can be
+    found.  (LP: #670188)
+
+ -- Barry Warsaw <[e-mail]>  Thu, 04 Nov 2010 14:33:04 -0400
+
 python-distutils-extra (2.22-3) unstable; urgency=low
 
   [ Martin Pitt ]
 
=== modified file 'setup.py'
--- setup.py	2010-09-16 12:06:26 +0000
+++ setup.py	2010-11-04 18:44:43 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from setuptools import setup
-import glob, os, sys
+import sys
 
 sys.path.insert(0, '.')
 from DistUtilsExtra import __version__ as pkgversion
 
=== modified file 'test/auto.py'
--- test/auto.py	2010-10-01 16:03:27 +0000
+++ test/auto.py	2010-11-04 18:44:43 +0000
@@ -2,7 +2,7 @@
 
 # test DistUtilsExtra.auto
 
-import sys, unittest, shutil, tempfile, os, os.path, subprocess, re
+import unittest, shutil, tempfile, os, os.path, subprocess, re
 
 class T(unittest.TestCase):
     def setUp(self):
@@ -32,7 +32,7 @@
         try:
             # check that setup.py clean removes everything
             (o, e, s) = self.setup_py(['clean', '-a'])
-            self.assertEqual(s, 0)
+            self.assertEqual(s, 0, o+e)
             cruft = self.diff_snapshot()
             self.assertEqual(cruft, '', 'no cruft after cleaning:\n' + cruft)
         finally:
@@ -759,9 +759,11 @@
         if not self.snapshot:
             self.do_snapshot()
 
-        env = os.environ
+        env = os.environ.copy()
         oldcwd = os.getcwd()
-        if 'PYTHONPATH' not in env:
+        if 'PYTHONPATH' in env:
+            env['PYTHONPATH'] = oldcwd + os.pathsep + env['PYTHONPATH']
+        else:
             env['PYTHONPATH'] = oldcwd
         os.chdir(self.src)
         s = subprocess.Popen(['/proc/self/exe', 'setup.py'] + args, env=env,