Compatibility: unbreak urllib import for old distros

Old versions of python-six shipped on e.g. Debian 7, Ubuntu 12.04 and openSUSE 12.3 do not contain urllib. Signed-off-by: Markus Lehtonen <[email protected]>
marquiz · Apr 14, 2016 · 656e9cd · 656e9cd
1 parent 863e438
commit 656e9cd
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/gbp/scripts/create_remote_repo.py b/gbp/scripts/create_remote_repo.py
@@ -23,7 +23,6 @@
 from six.moves import configparser
 import sys
 import os, os.path
-from six.moves import urllib
 import subprocess
 import tty, termios
 import re
@@ -108,7 +107,14 @@ def parse_url(remote_url, name, pkg, template_dir=None):
         ...
     GbpError: URL contains invalid ~username expansion.
     """
-    frags = urllib.parse.urlparse(remote_url)
+    # Fix for old distros like Debian 7, Ubuntu 12.04 and openSUSE 12.3 with old
+    # python-six that doesn't have urllib
+    try:
+        from six.moves import urllib
+        frags = urllib.parse.urlparse(remote_url)
+    except ImportError:
+        import urlparse
+        frags = urlparse.urlparse(remote_url)
     if frags.scheme in ['ssh', 'git+ssh', '']:
         scheme = frags.scheme
     else: