diff options
| author | ?ric Araujo <merwok@netwok.org> | 2011-09-18 23:10:58 +0200 |
|---|---|---|
| committer | ?ric Araujo <merwok@netwok.org> | 2011-09-18 23:10:58 +0200 |
| commit | e540eb924ab686c193139ea5700c01bc63fb1f9a (patch) | |
| tree | 5d470fbdb5a3cb04055dd9b7285699c7a6ed89ab /distutils2/tests/pypi_server.py | |
| parent | e521323055ea39e3d4d022c900eb8f1732567eb3 (diff) | |
| download | disutils2-e540eb924ab686c193139ea5700c01bc63fb1f9a.tar.gz | |
Fix backport changesets part 3: backported modules.
shutil, sysconfig, tarfile and their tests have been updated to the
latest 3.2 version (except for test_tarfile which is not backported yet)
and edited to be compatible with 2.4.
Duplicates added in util during the Great Update have been deleted, as
well as functions I removed recently in packaging. Unneeded modules in
_backport have been deleted or moved to d2.compat.
Diffstat (limited to 'distutils2/tests/pypi_server.py')
| -rw-r--r-- | distutils2/tests/pypi_server.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/distutils2/tests/pypi_server.py b/distutils2/tests/pypi_server.py index 5d629a0..c98e232 100644 --- a/distutils2/tests/pypi_server.py +++ b/distutils2/tests/pypi_server.py @@ -39,11 +39,8 @@ from SimpleHTTPServer import SimpleHTTPRequestHandler from SimpleXMLRPCServer import SimpleXMLRPCServer from distutils2.tests import unittest +from distutils2.compat import wraps -try: - from functools import wraps -except ImportError: - from distutils2._backport.functools import wraps PYPI_DEFAULT_STATIC_PATH = os.path.join( |