[Python-checkins] distutils2: fixed imports

[tarek.ziade]

tarek.ziade pushed 642169797dfc to distutils2:

http://hg.python.org/distutils2/rev/642169797dfc
changeset:   264:642169797dfc
user:        Konrad Delong <konryd at gmail.com>
date:        Thu May 13 14:10:25 2010 +0200
summary:     fixed imports
files:       src/distutils2/tests/pypi_server.py, src/distutils2/tests/test_upload.py

diff --git a/src/distutils2/tests/pypi_server.py b/src/distutils2/tests/pypi_server.py
--- a/src/distutils2/tests/pypi_server.py
+++ b/src/distutils2/tests/pypi_server.py
@@ -1,13 +1,5 @@
-import threading
-import copy
-import Queue
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
-
-import time
-from wsgiref.simple_server import make_server, demo_app
+import Queue, threading, time
+from wsgiref.simple_server import make_server
 
 class PyPIServer(threading.Thread):
     """Thread that wraps a wsgi app"""
diff --git a/src/distutils2/tests/test_upload.py b/src/distutils2/tests/test_upload.py
--- a/src/distutils2/tests/test_upload.py
+++ b/src/distutils2/tests/test_upload.py
@@ -1,16 +1,12 @@
 """Tests for distutils.command.upload."""
 # -*- encoding: utf8 -*-
-import sys
-import os
-import unittest2
+import os, unittest2
 
-from distutils2.command import upload as upload_mod
 from distutils2.command.upload import upload
 from distutils2.core import Distribution
 
-from distutils2.tests import support
+from distutils2.tests.pypi_server import PyPIServer
 from distutils2.tests.test_config import PYPIRC, PyPIRCCommandTestCase
-from distutils2.tests.pypi_server import PyPIServer
 
 
 PYPIRC_NOPASSWORD = """\

--
Repository URL: http://hg.python.org/distutils2