Merge remote-tracking branch 'upstream/master'

ibobalo · ibobalo · commit 8f04c7b70da9 · 2015-11-16T13:59:36.000+02:00
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -35,7 +35,10 @@
     from urllib.request import FancyURLopener
 except ImportError:
     from urllib import FancyURLopener
-from urlparse import urlparse
+try:
+    from urlparse import urlparse
+except ImportError:
+    from urllib.parse import urlparse
 
 import argparse
 from appdirs import user_data_dir
