python3: add teuthology.util.compat module

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>

diff --git a/teuthology/lock/query.py b/teuthology/lock/query.py
index 99e5deafb54b703a55336bd37af335db27607507..94ad8f58e9142a140f8778978311526ffa94655d 100644 (file)
--- a/teuthology/lock/query.py
+++ b/teuthology/lock/query.py
@@ -1,15 +1,11 @@
 import logging
 import os
 
-try:
-    from urllib.parse import urlencode
-except ImportError:
-    from urllib import urlencode
-
 import requests
 
 from teuthology import misc
 from teuthology.config import config
+from teuthology.util.compat import urlencode
 
 
 log = logging.getLogger(__name__)

diff --git a/teuthology/misc.py b/teuthology/misc.py
index f7fba973cd7ed40f911f85ea59d30d5b6e5ca64f..1da124223a4210ae7009a384f83e55c55b479687 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -18,13 +18,7 @@ import json
 import re
 import pprint
 
-try:
-    from urllib.parse import urljoin
-    from urllib.request import urlopen
-    from urllib.error import HTTPError
-except ImportError:
-    from urlparse import urljoin
-    from urllib2 import urlopen,  HTTPError
+from teuthology.util.compat import urljoin, urlopen, HTTPError
 
 from netaddr.strategy.ipv4 import valid_str as _is_ipv4
 from netaddr.strategy.ipv6 import valid_str as _is_ipv6

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index 78e94338d549051e7f26894340bba5dd523f496a..3230463eb43b4344174e662bce415399d1c81e19 100644 (file)
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -3,11 +3,7 @@ import ast
 import re
 import requests
 
-try:
-    from urllib.parse import urljoin, urlencode
-except ImportError:
-    from urlparse import urljoin
-    from urllib import urlencode
+from teuthology.util.compat import urljoin, urlencode
 
 from collections import OrderedDict
 from cStringIO import StringIO

diff --git a/teuthology/provision/cloud/openstack.py b/teuthology/provision/cloud/openstack.py
index 5882d57ad4f304020a29fb3010c746979ebcf5f4..54dca73aba53eae920cb0418c872b25ec6433b0d 100644 (file)
--- a/teuthology/provision/cloud/openstack.py
+++ b/teuthology/provision/cloud/openstack.py
@@ -5,10 +5,7 @@ import socket
 import time
 import yaml
 
-try:
-    from urllib.parse import  urlencode
-except ImportError:
-    from urllib import urlencode
+from teuthology.util.compat import urlencode
 
 from copy import deepcopy
 from libcloud.common.exceptions import RateLimitReachedError, BaseHTTPError

diff --git a/teuthology/provision/cloud/test/test_openstack.py b/teuthology/provision/cloud/test/test_openstack.py
index cc3f26c256ec65862298eba122d6ef88059c642b..02a046cbe24fe7bdc5ca84b70223e496d2dfe190 100644 (file)
--- a/teuthology/provision/cloud/test/test_openstack.py
+++ b/teuthology/provision/cloud/test/test_openstack.py
@@ -2,11 +2,7 @@ import socket
 import yaml
 import os
 
-try:
-    from urllib.parse import parse_qs
-except ImportError:
-    from urlparse import parse_qs
-
+from teuthology.util.compat import parse_qs
 
 from copy import deepcopy
 from libcloud.compute.providers import get_driver

diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py
index 833fcc079872ac96eb2d3875382f7fb05169f33b..3d497e1c95feff736fa26ddcd1835d17da7d70e1 100644 (file)
--- a/teuthology/task/kernel.py
+++ b/teuthology/task/kernel.py
@@ -8,10 +8,7 @@ import os
 import re
 import shlex
 
-try:
-    from urllib.parse import urljoin
-except ImportError:
-    from urlparse import urljoin
+from teuthology.util.compat import urljoin
 
 from teuthology import misc as teuthology
 from teuthology.parallel import parallel

diff --git a/teuthology/task/pcp.py b/teuthology/task/pcp.py
index d016327f08b5c11bf06b2b274feff2a4b3b7b548..53dcd51f2a74b199814f6115feebbf3f8406e7a1 100644 (file)
--- a/teuthology/task/pcp.py
+++ b/teuthology/task/pcp.py
@@ -7,11 +7,7 @@ import os
 import requests
 import time
 
-try:
-    from urllib.parse import urljoin, urlencode
-except ImportError:
-    from urlparse import urljoin
-    from urllib import urlencode
+from teuthology.util.compat import urljoin, urlencode
 
 from teuthology.config import config as teuth_config
 from teuthology.orchestra import run

diff --git a/teuthology/test/task/test_pcp.py b/teuthology/test/task/test_pcp.py
index 68b9093e2478167ebf522a904887a172966a9751..c70e5445338709a970f1246613695fb14b2d1caa 100644 (file)
--- a/teuthology/test/task/test_pcp.py
+++ b/teuthology/test/task/test_pcp.py
@@ -1,10 +1,7 @@
 import os
 import requests
 
-try:
-    from urllib.parse import parse_qs, urljoin
-except ImportError:
-    from urlparse import parse_qs, urljoin
+from teuthology.util.compat import parse_qs, urljoin
 
 from mock import patch, DEFAULT, Mock, mock_open, call
 from pytest import raises

diff --git a/teuthology/util/compat.py b/teuthology/util/compat.py
new file mode 100644 (file)
index 0000000..fc654e3
--- /dev/null
+++ b/teuthology/util/compat.py
@@ -0,0 +1,16 @@
+import sys
+
+PY3 = False
+
+if sys.version_info >= (3, 0):
+    PY3 = True
+
+if PY3:
+    from urllib.parse import parse_qs, urljoin, urlparse, urlencode # noqa: F401
+    from urllib.request import urlopen, Request # noqa: F401
+    from urllib.error import HTTPError # noqa: F401
+else:
+    from urlparse import parse_qs, urljoin, urlparse # noqa: F401
+    from urllib import urlencode # noqa: F401
+    from urllib2 import urlopen, Request, HTTPError # noqa: F401
+