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

[Barry Warsaw]

Handles the case that $PYTHONPATH is in the user's environment. Probably not important for the buildd's but it makes sbuilds less sensitive to environmental differences. This branch also cleans up a few pyflakes warnings.

With this branch, I can build the binary package in my sbuilds for natty.

[Martin Pitt (pitti)]

Barry,

unfortuately this merge went totally wrong (see generated diff). Even looking at r21 in your branch doesn't give me a sensible patch.

Perhaps you can re-do this against lp:python-distutils-extra, or just send me a plain patch?

review: Needs Fixing

[Barry Warsaw (barry)]

Hi Martin,

The merge only looks crazy because it removes the .pc directory from version control. IIUC, that quilt artifact should not be in bzr, but you're probably right that it was too much distraction from the meat of the change.

I'll redo the patch against lp:python-distutils-extra and submit a merge proposal against that.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-11-03 17:39:44 +0000
@@ -0,0 +1,1 @@
+.pc
 
=== removed directory '.pc'
=== removed file '.pc/.version'
--- .pc/.version	2010-09-23 16:00:58 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2
 
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2010-09-23 16:00:58 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian-changes-2.22-2
 
=== removed directory '.pc/debian-changes-2.22-2'
=== removed directory '.pc/debian-changes-2.22-2/DistUtilsExtra'
=== removed directory '.pc/debian-changes-2.22-2/DistUtilsExtra/command'
=== removed file '.pc/debian-changes-2.22-2/DistUtilsExtra/command/check.py'
--- .pc/debian-changes-2.22-2/DistUtilsExtra/command/check.py	2010-09-23 16:00:58 +0000
+++ .pc/debian-changes-2.22-2/DistUtilsExtra/command/check.py	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-# DistUtilsExtra.command.check - check command for DistUtilsExtra
-#
-# Author: Rodney Dawes <[e-mail]>
-#
-# Copyright 2009 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along 
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""DistUtilsExtra.command.check
-
-Implements the DistUtilsExtra 'check' command.
-"""
-
-import os
-import subprocess
-
-from distutils.core import Command
-
-
-class check (Command):
-    """Command to run lint and tests on a module."""
-
-    description = "integrate pylint checks"
-
-    user_options = [("config-file=", None,
-                     "pylint config file to use"),
-                    ("exclude-files=", None,
-                     "list of files to exclude from lint checks"),
-                    ("lint-files=", None,
-                     "list of modules or packages to run lint checks on")
-                   ]
-
-    def initialize_options (self):
-        self.config_file = None
-        self.exclude_files = None
-        self.lint_files = None
-
-    def finalize_options (self):
-        if self.config_file is None:
-            self.config_file = ""
-        if self.exclude_files is None:
-            self.exclude_files = "[]"
-        if self.lint_files is None:
-            self.lint_files = "[" + self.__find_files() + "]"
-
-    def run (self):
-        pylint_args = ["--output-format=parseable",
-                       "--include-ids=yes"]
-
-        if self.config_file:
-            pylint_args.append("--rcfile=" + self.config_file)
-
-        for file in eval(self.lint_files):
-            pylint_args.append(file)
-
-        p = subprocess.Popen(["pylint"] + pylint_args,
-                             bufsize=4096, stdout=subprocess.PIPE)
-        notices = p.stdout
-
-        output = "".join(notices.readlines())
-        if output != "":
-            print "== Pylint notices =="
-            print self.__group_lines_by_file(output)
-
-    def __group_lines_by_file(self, input):
-        """Format file:line:message output as lines grouped by file."""
-        outputs = []
-        filename = ""
-        excludes = eval(self.exclude_files)
-        for line in input.splitlines():
-            current = line.split(":", 3)
-            if line.startswith("    "):
-                outputs.append("    " + current[0] + "")
-            elif line.startswith("build/") or current[0] in excludes or \
-                    len(current) < 3:
-                pass
-            elif filename == current[0]:
-                outputs.append("    " + current[1] + ": " + current[2])
-            elif filename != current[0]:
-                filename = current[0]
-                outputs.append("")
-                outputs.append(filename + ":")
-                outputs.append("    " + current[1] + ": " + current[2])
-
-        return "\n".join(outputs)
-
-    def __find_files(self):
-        """Find all Python files under the current tree."""
-        pyfiles = []
-        for root, dirs, files in os.walk(os.getcwd(), topdown=False):
-            for file in files:
-                if file.endswith(".py"):
-                    pyfiles.append("'" + os.path.join(root, file) + "'")
-        pyfiles.sort()
-        return ",".join(pyfiles)
 
=== removed directory '.pc/debian-changes-2.22-2/test'
=== removed file '.pc/debian-changes-2.22-2/test/auto.py'
--- .pc/debian-changes-2.22-2/test/auto.py	2010-09-23 16:00:58 +0000
+++ .pc/debian-changes-2.22-2/test/auto.py	1970-01-01 00:00:00 +0000
@@ -1,930 +0,0 @@
-#!/usr/bin/python
-
-# test DistUtilsExtra.auto
-
-import sys, unittest, shutil, tempfile, os, os.path, subprocess, re
-
-class T(unittest.TestCase):
-    def setUp(self):
-        self.src = tempfile.mkdtemp()
-
-        self._mksrc('setup.py', '''
-from DistUtilsExtra.auto import setup
-
-setup(
-    name='foo',
-    version='0.1',
-    description='Test suite package',
-    url='https://foo.example.com',
-    license='GPL v2 or later',
-    author='Martin Pitt',
-    author_email='[e-mail]',
-)
-''')
-        self.snapshot = None
-        self.install_tree = None
-
-    def tearDown(self):
-        try:
-            # check that setup.py clean removes everything
-            (o, e, s) = self.setup_py(['clean', '-a'])
-            self.assertEqual(s, 0)
-            cruft = self.diff_snapshot()
-            self.assertEqual(cruft, '', 'no cruft after cleaning:\n' + cruft)
-        finally:
-            shutil.rmtree(self.src)
-            if self.snapshot:
-                shutil.rmtree(self.snapshot)
-            if self.install_tree:
-                shutil.rmtree(self.install_tree)
-            self.src = None
-            self.snapshot = None
-            self.install_tree = None
-
-    #
-    # actual tests come here
-    #
-
-    def test_empty(self):
-        '''empty source tree (just setup.py)'''
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o)
-
-        f = self.installed_files()
-        # just installs the .egg_info
-        self.assertEqual(len(f), 1)
-        self.assert_(f[0].endswith('.egg-info'))
-
-    def test_vcs(self):
-        '''Ignores revision control files'''
-
-        self._mksrc('.shelf/1')
-        self._mksrc('.bzr/revs')
-        self._mksrc('.git/config')
-        self._mksrc('.svn/revs')
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o)
-
-        f = self.installed_files()
-        # just installs the .egg_info
-        self.assertEqual(len(f), 1)
-        self.assert_(f[0].endswith('.egg-info'))
-
-    def test_modules(self):
-        '''Python modules'''
-
-        self._mksrc('yesme.py')
-        self._mksrc('stuff/notme.py')
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.assert_('following files are not recognized' in o)
-        self.assert_('\n  stuff/notme.py\n' in o)
-
-        f = '\n'.join(self.installed_files())
-        self.assert_('-packages/yesme.py' in f)
-        self.failIf('notme' in f)
-
-    def test_packages(self):
-        '''Python packages'''
-
-        self._mksrc('foopkg/__init__.py', '')
-        self._mksrc('foopkg/bar.py')
-        self._mksrc('foopkg/baz.py')
-        self._mksrc('noinit/notme.py')
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.assert_('following files are not recognized' in o)
-        self.assert_('\n  noinit/notme.py\n' in o)
-
-        f = '\n'.join(self.installed_files())
-        self.assert_('foopkg/__init__.py' in f)
-        self.assert_('foopkg/bar.py' in f)
-        self.failIf('noinit' in f)
-
-    def test_dbus(self):
-        '''D-BUS configuration and service files'''
-
-        # D-BUS ACL configuration file
-        self._mksrc('daemon/com.example.foo.conf', '''<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-</busconfig>''')
-
-        # non-D-BUS configuration file
-        self._mksrc('daemon/defaults.conf', 'start = True\nlog = syslog')
-
-        # D-BUS system service
-        self._mksrc('daemon/com.example.foo.service', '''[D-BUS Service]
-Name=com.example.Foo
-Exec=/usr/lib/foo/foo_daemon
-User=root''')
-
-        # D-BUS session service
-        self._mksrc('gui/com.example.foo.gui.service', '''[D-BUS Service]
-Name=com.example.Foo.GUI
-Exec=/usr/bin/foo-gtk
-''')
-
-        # non-D-BUS .service file
-        self._mksrc('stuff/super.service', 'I am a file')
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.assert_('following files are not recognized' in o)
-        self.assert_('\n  stuff/super.service\n' in o)
-
-        f = self.installed_files()
-        self.assertEqual(len(f), 4) # 3 D-BUS files plus .egg-info
-        self.assert_('/etc/dbus-1/system.d/com.example.foo.conf' in f)
-        self.assert_('/usr/share/dbus-1/system-services/com.example.foo.service' in f)
-        self.assert_('/usr/share/dbus-1/services/com.example.foo.gui.service' in f)
-        self.failIf('super.service' in '\n'.join(f))
-
-    def test_apport_hook(self):
-        '''Apport hooks'''
-
-        self._mksrc('apport/foo.py', '''import os, apport
-def add_info(report):
-    pass
-''')
-
-        self._mksrc('apport/source_foo.py', '''import os, apport
-def add_info(report):
-    pass
-''')
-
-        (o, e, s) = self.do_install()
-        self.failIf('following files are not recognized' in o, o)
-        
-        f = self.installed_files()
-        self.assertEqual(len(f), 3, f) # 2 hook files plus .egg-info
-        self.assert_('/usr/share/apport/package-hooks/foo.py' in f, f)
-        self.assert_('/usr/share/apport/package-hooks/source_foo.py' in f, f)
-        
-    def test_po(self):
-        '''gettext *.po files'''
-
-        self._mkpo()
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o)
-        f = self.installed_files()
-        self.assert_('/usr/share/locale/de/LC_MESSAGES/foo.mo' in f)
-        self.assert_('/usr/share/locale/fr/LC_MESSAGES/foo.mo' in f)
-        self.failIf('junk' in '\n'.join(f))
-
-        msgunfmt = subprocess.Popen(['msgunfmt',
-            os.path.join(self.install_tree,
-            'usr/share/locale/de/LC_MESSAGES/foo.mo')],
-            stdout=subprocess.PIPE)
-        out = msgunfmt.communicate()[0].decode()
-        self.assertEqual(out, open(os.path.join(self.src, 'po/de.po')).read())
-
-    def test_policykit(self):
-        '''*.policy.in PolicyKit files'''
-
-        self._mksrc('daemon/com.example.foo.policy.in', '''<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<policyconfig>
-  <vendor>Foo project</vendor>
-  <vendor_url>https://foo.example.com</vendor_url>
-
-  <action id="com.example.foo.greet">
-    <_description>Good morning</_description>
-    <_message>Hello</_message>
-    <defaults>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-</policyconfig>''')
-
-        self._mkpo()
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o)
-
-        f = self.installed_files()
-        self.assert_('/usr/share/PolicyKit/policy/com.example.foo.policy' in f)
-        p = open(os.path.join(self.install_tree,
-            'usr/share/PolicyKit/policy/com.example.foo.policy')).read()
-        self.assert_('<description>Good morning</description>' in p)
-        self.assert_('<description xml:lang="de">Guten Morgen</description>' in p)
-        self.assert_('<message>Hello</message>' in p)
-        self.assert_('<message xml:lang="de">Hallo</message>' in p)
-
-        # polkit-1
-        self._mksrc('foo.py', '''polkit = dbus.Interface(dbus.SystemBus().get_object(
-    'org.freedesktop.PolicyKit1',
-    '/org/freedesktop/PolicyKit1/Authority', False),
-    'org.freedesktop.PolicyKit1.Authority')
-''')
-        self.setup_py(['clean', '-a'])
-        self.snapshot = None
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o)
-
-        f = self.installed_files()
-        self.failIf('/usr/share/PolicyKit/policy/com.example.foo.policy' in f)
-        self.assert_('/usr/share/polkit-1/actions/com.example.foo.policy' in f)
-
-    def test_desktop(self):
-        '''*.desktop.in files'''
-
-        self._mksrc('gui/foogtk.desktop.in', '''[Desktop Entry]
-_Name=Hello
-_Comment=Good morning
-Exec=/bin/foo''')
-        self._mksrc('gui/autostart/fooapplet.desktop.in', '''[Desktop Entry]
-_Name=Hello
-_Comment=Good morning
-Exec=/usr/bin/fooapplet''')
-        self._mkpo()
-        self._mksrc('data/foosettings.desktop.in', '''[Desktop Entry]
-_Name=Hello
-_Comment=Good morning
-Exec=/bin/foosettings''')
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o)
-
-        f = self.installed_files()
-        self.assert_('/usr/share/autostart/fooapplet.desktop' in f)
-        self.assert_('/usr/share/applications/foogtk.desktop' in f)
-        self.assert_('/usr/share/applications/foosettings.desktop' in f)
-        # data/*.desktop.in shouldn't go to data dir
-        self.failIf('/usr/share/foo/' in f)
-
-        p = open(os.path.join(self.install_tree,
-            'usr/share/autostart/fooapplet.desktop')).read()
-        self.assert_('\nName=Hello\n' in p)
-        self.assert_('\nName[de]=Hallo\n' in p)
-        self.assert_('\nComment[fr]=Bonjour\n' in p)
-
-    def test_icons(self):
-        '''data/icons/'''
-
-        self._mksrc('data/icons/scalable/actions/press.png')
-        self._mksrc('data/icons/48x48/apps/foo.png')
-        action_icon_path = os.path.join(self.src, 'data', 'icons', 'scalable',
-                'actions')
-        os.symlink(os.path.join(action_icon_path, 'press.png'),
-                os.path.join(action_icon_path, 'crunch.png'))
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o)
-
-        f = self.installed_files()
-        self.assert_('/usr/share/icons/hicolor/scalable/actions/press.png' in f)
-        self.assert_('/usr/share/icons/hicolor/scalable/actions/crunch.png' in f)
-        self.assert_('/usr/share/icons/hicolor/48x48/apps/foo.png' in f)
-        self.assert_(os.path.islink(os.path.join(self.install_tree, 
-           'usr/share/icons/hicolor/scalable/actions/crunch.png')))
-
-    def test_data(self):
-        '''Auxiliary files in data/'''
-
-        # have some explicitly covered files, to check that they don't get
-        # installed into prefix/share/foo/ again
-        self._mksrc('setup.py', '''
-from DistUtilsExtra.auto import setup
-from glob import glob
-
-setup(
-    name='foo',
-    version='0.1',
-    description='Test suite package',
-    url='https://foo.example.com',
-    license='GPL v2 or later',
-    author='Martin Pitt',
-    author_email='[e-mail]',
-
-    data_files = [
-      ('/lib/udev/rules.d', ['data/40-foo.rules']),
-      ('/etc/foo', glob('data/*.conf')),
-    ]
-)
-''')
-
-        self._mksrc('data/stuff')
-        self._mksrc('data/handlers/red.py', 'import sys\nprint ("RED")')
-        self._mksrc('data/handlers/blue.py', 'import sys\nprint ("BLUE")')
-        self._mksrc('data/40-foo.rules')
-        self._mksrc('data/blob1.conf')
-        self._mksrc('data/blob2.conf')
-        os.symlink('stuff', os.path.join(self.src, 'data', 'stufflink'))
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o)
-
-        f = self.installed_files()
-        self.assert_('/usr/share/foo/stuff' in f)
-        self.assert_('/usr/share/foo/stufflink' in f)
-        self.assert_(os.path.islink(os.path.join(self.install_tree, 'usr',
-            'share', 'foo', 'stufflink')))
-        self.assert_('/usr/share/foo/handlers/red.py' in f)
-        self.assert_('/usr/share/foo/handlers/blue.py' in f)
-        self.assert_('/lib/udev/rules.d/40-foo.rules' in f)
-        self.assert_('/etc/foo/blob1.conf' in f)
-        self.assert_('/etc/foo/blob2.conf' in f)
-        self.failIf('/usr/share/foo/blob1.conf' in f)
-        self.failIf('/usr/share/foo/40-foo.rules' in f)
-
-    def test_scripts(self):
-        '''scripts'''
-
-        # these should get autoinstalled
-        self._mksrc('bin/yell', '#!/bin/sh', True)
-        self._mksrc('bin/shout', '#!/bin/sh', True)
-        self._mksrc('bin/foo', '#!/bin/sh', True)
-        os.symlink('shout', os.path.join(self.src, 'bin', 'shoutlink'))
-
-        # these shouldn't
-        self._mksrc('daemon/food', '#!/bin/sh', True) # not in bin/
-        self._mksrc('foob', '#!/bin/sh', True) # not named like project
-        self._mksrc('bin/whisper', '#!/bin/sh') # not executable
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.assert_('following files are not recognized' in o)
-        self.assert_('\n  foob' in o)
-        self.assert_('\n  bin/whisper' in o)
-        self.assert_('\n  daemon/food' in o)
-
-        f = self.installed_files()
-        self.assert_('/usr/bin/yell' in f)
-        self.assert_('/usr/bin/shout' in f)
-        self.assert_('/usr/bin/shoutlink' in f)
-        self.assert_(os.path.islink(os.path.join(self.install_tree, 'usr',
-            'bin', 'shoutlink')))
-        self.assert_('/usr/bin/foo' in f)
-        ftext = '\n'.join(f)
-        self.failIf('food' in ftext)
-        self.failIf('foob' in ftext)
-        self.failIf('whisper' in ftext)
-
-        # verify that they are executable
-        binpath = os.path.join(self.install_tree, 'usr', 'bin')
-        self.assert_(os.access(os.path.join(binpath, 'yell'), os.X_OK))
-        self.assert_(os.access(os.path.join(binpath, 'shout'), os.X_OK))
-        self.assert_(os.access(os.path.join(binpath, 'foo'), os.X_OK))
-
-    def test_pot_manual(self):
-        '''PO template creation with manual POTFILES.in'''
-
-        self._mk_i18n_source()
-        self._mksrc('po/foo.pot', '')
-        # only do a subset here
-        self._mksrc('po/POTFILES.in', '''
-gtk/main.py
-gui/foo.desktop.in
-[type: gettext/glade]gtk/test.ui''')
-
-        (o, e, s) = self.setup_py(['build'])
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        # POT file should not be shown as not recognized
-        self.failIf('\n  po/foo.pot\n' in o)
-
-        pot_path = os.path.join(self.src, 'po', 'foo.pot')
-        self.assert_(os.path.exists(pot_path))
-        pot = open(pot_path).read()
-
-        self.failIf('msgid "no"' in pot)
-        self.assert_('msgid "yes1"' in pot)
-        self.assert_('msgid "yes2 %s"' in pot)
-        self.failIf('msgid "yes5"' in pot) # we didn't add helpers.py
-        self.assert_('msgid "yes7"' in pot) # we did include the desktop file
-        self.failIf('msgid "yes5"' in pot) # we didn't add helpers.py
-        self.assert_('msgid "yes11"' in pot) # we added one GTKBuilder file
-        self.failIf('msgid "yes12"' in pot) # ... but not the other
-
-    def test_pot_auto(self):
-        '''PO template creation with automatic POTFILES.in'''
-
-        self._mk_i18n_source()
-
-        (o, e, s) = self.setup_py(['build'])
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        # POT file should not be shown as not recognized
-        self.failIf('\n  po/foo.pot\n' in o)
-
-        pot_path = os.path.join(self.src, 'po', 'foo.pot')
-        self.assert_(os.path.exists(pot_path))
-        pot = open(pot_path).read()
-
-        self.failIf('msgid "no"' in pot)
-        for i in range(2, 15):
-            self.assert_('msgid "yes%i' % i in pot or 
-                   'msgid ""\n"yes%i' % i in pot,
-                   'yes%i' % i)
-        # above loop would match yes11 to yes1 as well, so test it explicitly
-        self.assert_('msgid "yes1"' in pot)
-
-    def test_pot_auto_explicit(self):
-        '''PO template creation with automatic POTFILES.in and explicit scripts'''
-
-        self._mk_i18n_source()
-
-        # add some additional binaries here which aren't caught by default
-        self._mksrc('cli/client-cli', "#!/usr/bin/python\nprint (_('yes15'))", True)
-        self._mksrc('gtk/client-gtk', '#!/usr/bin/python\nprint (_("yes16"))', True)
-        # this is the most tricky case: intltool doesn't consider them Python
-        # files by default and thus just looks for _(""):
-        self._mksrc('kde/client-kde', "#!/usr/bin/python\nprint (_('yes17'))", True)
-        self._mksrc('po/POTFILES.in.in', 'gtk/client-gtk\nkde/client-kde')
-        self._mksrc('setup.py', '''
-from DistUtilsExtra.auto import setup
-
-setup(
-    name='foo',
-    version='0.1',
-    data_files=[('share/foo', ['gtk/client-gtk', 'kde/client-kde'])],
-    scripts=['cli/client-cli'],
-)
-''')
-
-        (o, e, s) = self.setup_py(['build'])
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        # POT file should not be shown as not recognized
-        self.failIf('\n  po/foo.pot\n' in o)
-
-        pot_path = os.path.join(self.src, 'po', 'foo.pot')
-        self.assert_(os.path.exists(pot_path))
-        pot = open(pot_path).read()
-
-        self.failIf('msgid "no"' in pot)
-        for i in range(2, 18):
-            self.assert_('msgid "yes%i' % i in pot or 
-                   'msgid ""\n"yes%i' % i in pot,
-                   'yes%i' % i)
-        # above loop would match yes11 to yes1 as well, so test it explicitly
-        self.assert_('msgid "yes1"' in pot)
-
-    def test_standard_files(self):
-        '''Standard files (MANIFEST.in, COPYING, etc.)'''
-
-        self._mksrc('AUTHORS')
-        self._mksrc('COPYING')
-        self._mksrc('LICENSE')
-        self._mksrc('COPYING.LIB')
-        self._mksrc('README.txt')
-        self._mksrc('MANIFEST.in')
-        self._mksrc('MANIFEST')
-        self._mksrc('NEWS')
-        self._mksrc('TODO')
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o, o)
-
-        f = self.installed_files()
-        self.assert_('/usr/share/doc/foo/README.txt' in f)
-        self.assert_('/usr/share/doc/foo/NEWS' in f)
-        ftext = '\n'.join(f)
-        self.failIf('MANIFEST' in ftext)
-        self.failIf('COPYING' in ftext)
-        self.failIf('COPYING' in ftext)
-        self.failIf('AUTHORS' in ftext)
-        self.failIf('TODO' in ftext)
-
-        # sub-dir READMEs shouldn't be installed by default
-        self.snapshot = None
-        self._mksrc('extra/README')
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.assert_('following files are not recognized' in o)
-        self.assert_('\n  extra/README\n' in o)
-
-    def test_sdist(self):
-        '''default MANIFEST'''
-
-        good = ['AUTHORS', 'README.txt', 'COPYING', 'helpers.py',
-                'foo/__init__.py', 'foo/bar.py', 'tests/all.py',
-                'gui/x.desktop.in', 'backend/foo.policy.in',
-                'daemon/backend.conf', 'x/y', 'po/de.po', 'po/foo.pot',
-                '.quickly', 'data/icons/16x16/apps/foo.png', 'bin/foo',
-                'backend/food', 'backend/com.example.foo.service',
-                'gtk/main.glade', 'dist/extra.tar.gz']
-        bad = ['po/de.mo', '.helpers.py.swp', '.bzr/index', '.svn/index',
-               '.git/index', 'bin/foo~', 'backend/foo.pyc', 
-               'dist/foo-0.1.tar.gz', '.shelf/1', '.bzr/revs', '.git/config']
-
-        for f in good + bad:
-            self._mksrc(f)
-
-        (o, e, s) = self.setup_py(['sdist', '-o'])
-        self.assert_("'MANIFEST.in' does not exist" in e)
-        self.assertEqual(s, 0)
-
-        manifest = open(os.path.join(self.src, 'MANIFEST')).read().splitlines()
-
-        for f in good:
-            self.assert_(f in manifest, '%s in manifest' % f)
-        for f in bad:
-            self.failIf(f in manifest, '%s not in manifest' % f)
-        os.unlink(os.path.join(self.src, 'MANIFEST'))
-
-    def test_gtkbuilder(self):
-        '''GtkBuilder *.ui'''
-
-        self._mksrc('gtk/test.ui', '''<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkWindow" id="window1">
-    <property name="title" translatable="yes">yes11</property>
-    <child><placeholder/></child>
-  </object>
-</interface>''')
-
-        self._mksrc('gtk/settings.ui', '''<?xml version="1.0"?>
-<interface domain="foobar">
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkWindow" id="window2">
-    <property name="title" translatable="yes">yes12</property>
-    <child><placeholder/></child>
-  </object>
-</interface>''')
-
-        self._mksrc('someweird.ui')
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.assert_('following files are not recognized' in o)
-        self.assert_('\n  someweird.ui\n' in o)
-
-        f = self.installed_files()
-        self.assert_('/usr/share/foo/test.ui' in f)
-        self.assert_('/usr/share/foo/settings.ui' in f)
-        ftext = '\n'.join(f)
-        self.failIf('someweird' in ftext)
-
-    def test_manpages(self):
-        '''manpages'''
-
-        self._mksrc('man/foo.1', '.TH foo 1 "Jan 01, 1900" "Joe Developer"')
-        self._mksrc('daemon/food.8', '.TH food 8 "Jan 01, 1900" "Joe Developer"')
-        self._mksrc('cruft/food.1', '')
-        self._mksrc('daemon/notme.s', '.TH food 8 "Jan 01, 1900" "Joe Developer"')
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.assert_('following files are not recognized' in o)
-        self.assert_('\n  cruft/food.1\n' in o)
-        self.assert_('\n  daemon/notme.s\n' in o)
-
-        f = self.installed_files()
-        self.assert_('/usr/share/man/man1/foo.1' in f)
-        self.assert_('/usr/share/man/man8/food.8' in f)
-        ftext = '\n'.join(f)
-        self.failIf('food.1' in ftext)
-        self.failIf('notme' in ftext)
-
-    def test_etc(self):
-        '''etc/*'''
-
-        self._mksrc('etc/cron.daily/foo')
-        self._mksrc('etc/foo.conf')
-        self._mksrc('etc/init.d/foo', executable=True)
-        d = os.path.join(self.src, 'etc', 'cron.weekly')
-        os.mkdir(d)
-        os.symlink(os.path.join('..', 'cron.daily', 'foo'),
-                os.path.join(d, 'foo'))
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o, o)
-
-        f = self.installed_files()
-        self.assert_('/etc/cron.daily/foo' in f)
-        self.assert_('/etc/cron.weekly/foo' in f)
-        self.assert_('/etc/init.d/foo' in f)
-        self.assert_('/etc/foo.conf' in f)
-
-        # verify that init script is executable
-        self.assert_(os.access(os.path.join(self.install_tree, 'etc', 'init.d',
-            'foo'), os.X_OK))
-        # verify that symlinks get preserved
-        self.assert_(os.path.islink(os.path.join(self.install_tree, 'etc',
-            'cron.weekly', 'foo')))
-
-        # check that we can install again into the same source tree
-        (o, e, s) = self.setup_py(['install', '--no-compile', '--prefix=/usr', 
-            '--root=' + self.install_tree])
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.failIf('following files are not recognized' in o, o)
-
-    def test_requires_provides(self):
-        '''automatic requires/provides'''
-
-        try:
-            __import__('pkg_resources')
-            __import__('httplib2')
-        except ImportError:
-            self.fail('You need to have pkg_resources and httplib2 installed for this test suite to work')
-
-        self._mksrc('foo/__init__.py', '')
-        self._mksrc('foo/stuff.py', '''import xml.parsers.expat
-import os, os.path, email.mime, distutils.command.register
-from email import header as h
-import httplib2.iri2uri, unknown
-''')
-
-        self._mksrc('foo/bar/__init__.py', '')
-        self._mksrc('foo/bar/poke.py', 'def x(): pass')
-
-        self._mksrc('mymod.py', 'import foo\nfrom foo.bar.poke import x')
-
-        self._mksrc('bin/foo-cli', '''#!/usr/bin/python
-import sys
-import pkg_resources
-import foo.bar
-from httplib2 import iri2uri
-
-print ('import iamnota.module')
-''', executable=True)
-
-        # this shouldn't be treated specially
-        self._mksrc('data/example-code/template.py', 'import example.module')
-        self._mksrc('data/example-code/mymod/__init__.py', '')
-        self._mksrc('data/example-code/mymod/shiny.py', 'import example.othermod')
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(s, 0)
-        self.assertEqual(e, 'ERROR: Python module unknown not found\n')
-        self.failIf('following files are not recognized' in o)
-
-        inst = self.installed_files()
-        self.assert_('/usr/share/foo/example-code/template.py' in inst)
-        self.assert_('/usr/share/foo/example-code/mymod/shiny.py' in inst)
-        for f in inst:
-            if 'template.py' in f or 'shiny' in f:
-                self.failIf('packages' in f)
-
-        # parse .egg-info
-        (o, e, s) = self.setup_py(['install_egg_info', '-d', self.install_tree])
-        self.assertEqual(e, 'ERROR: Python module unknown not found\n')
-        egg = open(os.path.join(self.install_tree,
-            'foo-0.1.egg-info')).read().splitlines()
-        self.assert_('Name: foo' in egg)
-
-        # check provides
-        prov = [prop.split(' ', 1)[1] for prop in egg if prop.startswith('Provides: ')]
-        self.assertEqual(set(prov), set(['foo', 'mymod']))
-
-        # check requires
-        req = [prop.split(' ', 1)[1] for prop in egg if prop.startswith('Requires: ')]
-        self.assertEqual(set(req), set(['DistUtilsExtra.auto', 'httplib2', 'pkg_resources']))
-
-    def test_help(self):
-        '''Docbook XML help'''
-
-        self._mksrc('help/C/myprogram-C.omf')
-        self._mksrc('help/C/myprogram.xml')
-        self._mksrc('help/C/legal.xml')
-        self._mksrc('help/C/figures/mainscreen.png')
-        self._mksrc('help/de/myprogram-de.omf')
-        self._mksrc('help/de/myprogram.xml')
-        self._mksrc('help/de/legal.xml')
-        self._mksrc('help/de/figures/mainscreen.png')
-
-        self._mksrc('help/weird.xml')
-        self._mksrc('help/notme.png')
-
-        (o, e, s) = self.do_install()
-        self.assertEqual(e, '')
-        self.assertEqual(s, 0)
-        self.assert_('following files are not recognized' in o)
-        self.assert_('\n  help/weird.xml\n' in o)
-        self.assert_('\n  help/notme.png\n' in o)
-
-        f = self.installed_files()
-        self.assert_('/usr/share/omf/foo/myprogram-C.omf' in f)
-        self.assert_('/usr/share/omf/foo/myprogram-de.omf' in f)
-        self.assert_('/usr/share/gnome/help/foo/C/myprogram.xml' in f)
-        self.assert_('/usr/share/gnome/help/foo/C/legal.xml' in f)
-        self.assert_('/usr/share/gnome/help/foo/C/figures/mainscreen.png' in f)
-        self.assert_('/usr/share/gnome/help/foo/de/myprogram.xml' in f)
-        self.assert_('/usr/share/gnome/help/foo/de/legal.xml' in f)
-        self.assert_('/usr/share/gnome/help/foo/de/figures/mainscreen.png' in f)
-
-    #
-    # helper methods
-    #
-
-    def setup_py(self, args):
-        '''Run setup.py with given arguments.
-
-        For convenience, this snapshots the tree if no snapshot exists yet.
-
-        Return (out, err, exitcode) triple.
-        '''
-        if not self.snapshot:
-            self.do_snapshot()
-
-        env = os.environ
-        oldcwd = os.getcwd()
-        if 'PYTHONPATH' not in env:
-            env['PYTHONPATH'] = oldcwd
-        os.chdir(self.src)
-        s = subprocess.Popen(['/proc/self/exe', 'setup.py'] + args, env=env,
-            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        (out, err) = s.communicate()
-        out = out.decode()
-        err = err.decode()
-        os.chdir(oldcwd)
-
-        # python3 distutils bug workaround, filter out bogus errors
-        bogus_re = re.compile('^file .* \(for module .*\) not found$')
-        err = '\n'.join([l for l in err.splitlines() if not bogus_re.match(l)])
-        if err:
-            err += '\n'
-
-        return (out, err, s.returncode)
-
-    def do_install(self):
-        '''Run setup.py install into temporary tree.
-
-        Return (out, err, exitcode) triple.
-        '''
-        self.install_tree = tempfile.mkdtemp()
-
-        return self.setup_py(['install', '--no-compile', '--prefix=/usr', 
-            '--root=' + self.install_tree])
-
-    def installed_files(self):
-        '''Return list of file paths in install tree.'''
-
-        result = []
-        for root, _, files in os.walk(self.install_tree):
-            assert root.startswith(self.install_tree)
-            r = root[len(self.install_tree):]
-            for f in files:
-                result.append(os.path.join(r, f))
-        return result
-
-    def _mksrc(self, path, content=None, executable=False):
-        '''Create a file in the test source tree.'''
-
-        path = os.path.join(self.src, path)
-        dir = os.path.dirname(path)
-        if not os.path.isdir(dir):
-            os.makedirs(dir)
-        f = open(path, 'w')
-        if content is None:
-            # default content, to spot with diff
-            f.write('dummy')
-        else:
-            f.write(content + '\n')
-        f.close()
-
-        if executable:
-            os.chmod(path, 0o755)
-
-    def do_snapshot(self):
-        '''Snapshot source tree.
-
-        This should be called after a test set up all source files.
-        '''
-        assert self.snapshot is None, 'snapshot already taken'
-
-        self.snapshot = tempfile.mkdtemp()
-        shutil.copytree(self.src, os.path.join(self.snapshot, 's'))
-
-    def diff_snapshot(self):
-        '''Compare source tree to snapshot.
-
-        Return diff -Nur output.
-        '''
-        assert self.snapshot, 'no snapshot taken'
-        diff = subprocess.Popen(['diff', '-x', 'foo.pot', '-Nur', os.path.join(self.snapshot, 's'), 
-            self.src], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        (out, err) = diff.communicate()
-        out = out.decode()
-        self.assertEqual(err, b'', 'diff error messages')
-        return out
-
-    def _mkpo(self):
-        '''Create some example po files.'''
-
-        self._mksrc('po/POTFILES.in', '')
-        self._mksrc('po/de.po', '''msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8\\n"
-
-msgid "Good morning"
-msgstr "Guten Morgen"
-
-msgid "Hello"
-msgstr "Hallo"''')
-        self._mksrc('po/fr.po', '''msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8\\n"
-        
-msgid "Good morning"
-msgstr "Bonjour"''')
-
-    def _mk_i18n_source(self):
-        '''Create some example source files with gettext calls'''
-
-        self._mksrc('gtk/main.py', '''print (_("yes1"))
-print ("no1")
-print (__("no2"))
-x = _('yes2 %s') % y
-
-def f():
-    print (_("yes3"))
-    return _('yes6')''')
-
-        self._mksrc('helpers.py', '''
-print (f(_("yes4")))
-print (_(\'\'\'yes5
-even more
-lines\'\'\'))
-print (_("""yes6
-more lines"""))
-print (\'\'\'no3
-boo\'\'\')
-print ("""no4
-more""")''')
-
-        self._mksrc('gui/foo.desktop.in', '''[Desktop Entry]
-_Name=yes7
-_Comment=yes8
-Icon=no5
-Exec=/usr/bin/foo''')
-
-        self._mksrc('daemon/com.example.foo.policy.in', '''<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<policyconfig>
-  <action id="com.example.foo.greet">
-    <_description>yes9</_description>
-    <_message>yes10</_message>
-    <defaults>
-      <allow_active>no6</allow_active>
-    </defaults>
-  </action>
-</policyconfig>''')
-
-        self._mksrc('gtk/test.ui', '''<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkWindow" id="window1">
-    <property name="title" translatable="yes">yes11</property>
-    <child><placeholder/></child>
-  </object>
-</interface>''')
-
-        self._mksrc('data/settings.ui', '''<?xml version="1.0"?>
-<interface domain="foobar">
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkWindow" id="window1">
-    <property name="title" translatable="yes">yes12</property>
-    <child><placeholder/></child>
-  </object>
-</interface>''')
-
-        self._mksrc('Makefile', 'echo _("no7")')
-
-        # Executables without *.py extension
-        self._mksrc('gtk/foo-gtk', '#!/usr/bin/python\nprint (_("yes13"))',
-                executable=True)
-        self._mksrc('cli/foo-cli', '#!/usr/bin/env python\nprint (_(\'yes14\'))',
-                executable=True)
-        self._mksrc('daemon/foobarize', '#!/usr/bin/flex\np _("no8")',
-                executable=True)
-
-unittest.main()
 
=== modified file 'DistUtilsExtra/command/check.py'
--- DistUtilsExtra/command/check.py	2010-09-23 16:00:58 +0000
+++ DistUtilsExtra/command/check.py	2010-11-03 17:39:44 +0000
@@ -1,7 +1,20 @@
 # DistUtilsExtra.command.check - check command for DistUtilsExtra
 #
 # Author: Rodney Dawes <[e-mail]>
+#
 # Copyright 2009 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along 
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """DistUtilsExtra.command.check
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-09-23 16:00:58 +0000
+++ debian/changelog	2010-11-03 17:39:44 +0000
@@ -1,3 +1,10 @@
+python-distutils-extra (2.22-2ubuntu1) natty; urgency=low
+
+  * When the environment has $PYTHONPATH in it, we still need to prepend
+    oldcwd so that the DistUtilsExtra package can be found.  (LP: #670188)
+
+ -- Barry Warsaw <[e-mail]>  Wed, 03 Nov 2010 13:31:44 -0400
+
 python-distutils-extra (2.22-2) unstable; urgency=low
 
   * Upload to unstable, now that the current python3 is in unstable.
 
=== added file 'debian/patches/fix-pythonpath'
--- debian/patches/fix-pythonpath	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-pythonpath	2010-11-03 17:39:44 +0000
@@ -0,0 +1,49 @@
+=== modified file 'setup.py'
+--- setup.py	2010-09-17 13:42:32 +0000
++++ setup.py	2010-11-03 16:46:34 +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-09-23 16:00:58 +0000
++++ test/auto.py	2010-11-03 17:19:17 +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,
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-09-23 16:00:58 +0000
+++ debian/patches/series	2010-11-03 17:39:44 +0000
@@ -1,1 +1,2 @@
 debian-changes-2.22-2
+fix-pythonpath -p0
 
=== modified file 'test/auto.py'
--- test/auto.py	2010-09-23 16:00:58 +0000
+++ test/auto.py	2010-11-03 17:39:44 +0000
@@ -9,10 +9,6 @@
         self.src = tempfile.mkdtemp()
 
         self._mksrc('setup.py', '''
-# ignore warning about import from local path
-import warnings
-warnings.filterwarnings('ignore', 'Module DistUtilsExtra was already imported from.*')
-
 from DistUtilsExtra.auto import setup
 
 setup(