urlparse --> urllib.parse in py3

--HG--
extra : rebase_source : b845737250a36a725f75aa04109ea357f09955d0

2 files changed, 7 insertions, 2 deletions

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 345ec8ae..cb557361 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -9,7 +9,7 @@ from distutils.errors import *
 from distutils import log
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring
-from setuptools import svn_utils
+from .. import svn_utils
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
 from pkg_resources import parse_requirements, safe_name, parse_version, \
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 350f17c8..10c5861d 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -4,7 +4,11 @@ import sys
 import codecs

 from distutils import log

 import xml.dom.pulldom

-import urlparse

+

+try:

+    import urlparse

+except ImportError:

+    import urllib.parse as urlparse

 

 #requires python >= 2.4

 from subprocess import Popen as _Popen, PIPE as _PIPE

@@ -40,6 +44,7 @@ def _run_command(args, stdout=_PIPE, stderr=_PIPE):
         except NameError:

             data = str(data, encoding='utf-8')

 

+        #communciate calls wait()

         return proc.returncode, data