summaryrefslogtreecommitdiff
path: root/setuptools/svn_utils.py
diff options
context:
space:
mode:
authorPhilip Thiem <ptthiem@gmail.com>2013-07-05 08:23:44 -0500
committerPhilip Thiem <ptthiem@gmail.com>2013-07-05 08:23:44 -0500
commit5b7992850b0cddec9bc405042359cf751d970d59 (patch)
treead057268b4777750de6d967f0e2c14f81f4f73da /setuptools/svn_utils.py
parentadb810246108bfe67f4ac92ab0f644d250cce515 (diff)
downloadpython-setuptools-git-5b7992850b0cddec9bc405042359cf751d970d59.tar.gz
urlparse --> urllib.parse in py3
--HG-- extra : rebase_source : b845737250a36a725f75aa04109ea357f09955d0
Diffstat (limited to 'setuptools/svn_utils.py')
-rw-r--r--setuptools/svn_utils.py7
1 files changed, 6 insertions, 1 deletions
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