Fixed import of urlparse and rebase on upstream

This commit is contained in:
Michael Hansen
2013-10-29 09:43:52 -04:00
parent 7d4544f203
commit f11ef60c35
+1 -1
View File
@@ -14,7 +14,7 @@ try:
from urlparse import urlparse
except ImportError:
try:
from urllib import parse as urlparse
from urllib.parse import urlparse
except ImportError:
from six.moves.urllib_parse import urlparse