[Checkins] SVN: zc.buildout/branches/python-3-2/src/zc/buildout/download.py fixed recent import fixes

[Thomas Lotze]

Log message for revision 121324:
  fixed recent import fixes

Changed:
  U   zc.buildout/branches/python-3-2/src/zc/buildout/download.py

-=-
Modified: zc.buildout/branches/python-3-2/src/zc/buildout/download.py
===================================================================
--- zc.buildout/branches/python-3-2/src/zc/buildout/download.py	2011-04-07 08:31:21 UTC (rev 121323)
+++ zc.buildout/branches/python-3-2/src/zc/buildout/download.py	2011-04-07 08:36:00 UTC (rev 121324)
@@ -26,18 +26,14 @@
 import sys
 import tempfile
 try:
-    from urllib.request import FancyURLopener, URLopener
-    from urllib.request import urlretrieve
+    from urllib.request import FancyURLopener, URLopener, urlretrieve
     import urllib.request
     import urllib.parse as urlparse
-    import urllib.request as urllib2
     def set_urlopener(opener):
         urllib.request._urlopener = opener
 except ImportError:
-    from urllib import FancyURLopener, URLopener
-    from urllib2 import urlretrieve
+    from urllib import FancyURLopener, URLopener, urlretrieve
     import urllib
-    import urllib2
     import urlparse
     def set_urlopener(opener):
         urllib._urlopener = opener