Merge pull request #651 from zancas/py3_compat_stage1

Stage1 Python3 compatibility

Author: caphrim007

devtools/code_generator.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 # Copyright 2016 F5 Networks Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +14,8 @@
 # limitations under the License.
 #
 
-from source_engine import SourceEngine
-from template_engine import TemplateEngine
+from f5.devtools.source_engine import SourceEngine
+from f5.devtools.template_engine import TemplateEngine
 
 import os
 

devtools/crawler.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 # Copyright 2016 F5 Networks Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +14,7 @@
 # limitations under the License.
 #
 
-from code_generator import DEVICECONFDIR
+from f5.devtools.code_generator import DEVICECONFDIR
 
 import json
 import os

devtools/source_engine.py

@@ -14,6 +14,7 @@
 #
 
 '''Source engine container, combines code on filesystem with other sources.'''
+from __future__ import print_function
 
 LICENSE_AND_MODULE_DOCSTRING = """# Copyright 2016 F5 Networks Inc.
 #

devtools/template_engine.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Copyright 2016 F5 Networks Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

f5/bigip/__init__.py

@@ -18,9 +18,10 @@
 
 
 from icontrol.session import iControlRESTSession
-from urlparse import parse_qs
-from urlparse import urlparse
-
+try:
+    import urlparse
+except ImportError:
+    import urllib.parse as urlparse
 
 from f5.bigip.cm import Cm
 from f5.bigip.resource import PathElement
@@ -80,7 +81,8 @@ def _get_tmos_version(self):
         base_uri = self._meta_data['uri'] + 'tm/sys/'
         response = connect.get(base_uri)
         ver = response.json()
-        version = parse_qs(urlparse(ver['selfLink']).query)['ver'][0]
+        version = urlparse.parse_qs(
+            urlparse.urlparse(ver['selfLink']).query)['ver'][0]
         self._meta_data['tmos_version'] = version
 
 

f5/bigip/cm/autodeploy/test/test_software_image_uploads.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Copyright 2016 F5 Networks Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

f5/bigip/resource.py

@@ -91,7 +91,10 @@
 import keyword
 import re
 import tokenize
-import urlparse
+try:
+    import urlparse
+except ImportError:
+    from urllib import parse as urlparse
 
 from f5.bigip.mixins import LazyAttributeMixin
 from f5.bigip.mixins import ToDictMixin

f5/bigip/shared/file_transfer.py

@@ -17,7 +17,10 @@
 #
 
 import os
-from StringIO import StringIO
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 from f5.bigip.mixins import FileUploadMixin
 from f5.bigip.resource import PathElement

f5/bigip/shared/test/test_file_uploads.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Copyright 2016 F5 Networks Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +16,10 @@
 
 import mock
 import pytest
-from StringIO import StringIO
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 from f5.bigip import ManagementRoot
 from f5.bigip.shared.file_transfer import\

f5/bigip/test/test___init__.py

@@ -14,7 +14,10 @@
 
 import mock
 import pytest
-import urlparse
+try:
+    import urlparse
+except ImportError:
+    from urllib import parse as urlparse
 
 from f5.bigip import BigIP