Python3 migration

vklohiya · Mar 11, 2020 · 7ceab30 · 7ceab30
1 parent 36c67de
commit 7ceab30
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/agent-build-requirements.txt b/agent-build-requirements.txt
@@ -1,4 +1,4 @@
--e git+https://github.com/f5devcentral/f5-cccl.git@f6d499272ae6fe9c9132963f2ff52dc96aba7982#egg=f5-cccl
+-e git+https://github.com/f5devcentral/f5-cccl.git@f2498ad9e72e430005f66e5f9747498ce057ead7#egg=f5-cccl
 pytest==3.0.2
 mock==2.0.0
 flake8==3.4.1

diff --git a/agent-runtime-requirements.txt b/agent-runtime-requirements.txt
@@ -1,3 +1,3 @@
--e git+https://github.com/f5devcentral/f5-cccl.git@f6d499272ae6fe9c9132963f2ff52dc96aba7982#egg=f5-cccl
+-e git+https://github.com/f5devcentral/f5-cccl.git@f2498ad9e72e430005f66e5f9747498ce057ead7#egg=f5-cccl
 pyinotify==0.9.6
 requests==2.20.0
diff --git a/f5_ctlr_agent/bigipconfigdriver.py b/f5_ctlr_agent/bigipconfigdriver.py
@@ -13,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import
+
 
 import argparse
 import fcntl
@@ -30,7 +30,7 @@
 
 import pyinotify
 
-from urlparse import urlparse
+from urllib.parse import urlparse
 from f5_cccl.api import F5CloudServiceManager
 from f5_cccl.exceptions import F5CcclError
 from f5_cccl.utils.mgmt import mgmt_root
@@ -790,7 +790,7 @@ def _bigip_connect_cb(log_success):
                 if log_success:
                     log.info('BIG-IP connection established.')
                 return (True, bigip)
-            except Exception, e:
+            except Exception as e:
                 return (False, 'BIG-IP connection error: {}'.format(e))
         bigip = _retry_backoff(_bigip_connect_cb)
 

diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@
     if req.link is not None:
         install_links.append(str(req.link) + '-0')
 
-print('install requirements', install_reqs)
+print(('install requirements', install_reqs))
 setup(
     name='f5-ctlr-agent',
     description='F5 Networks Controller Agent',

diff --git a/tests/f5_ctlr_agent/test_bigipconfigdriver.py b/tests/f5_ctlr_agent/test_bigipconfigdriver.py
@@ -13,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import
+
 
 from copy import deepcopy
 import json
@@ -66,7 +66,7 @@
     },
     'global': {
         'verify-interval': 0.25,
-        'log-level': u'INFO'
+        'log-level': 'INFO'
     }
 }
 
@@ -106,7 +106,7 @@
             },
             'pool': {
                 'monitor': None,
-                'loadBalancingMode': u'round-robin'
+                'loadBalancingMode': 'round-robin'
             }
         }
     }

diff --git a/tests/f5_ctlr_agent/test_k8scloudbigip.py b/tests/f5_ctlr_agent/test_k8scloudbigip.py
@@ -17,7 +17,7 @@
 Units tests for testing BIG-IP resource management.
 
 """
-from __future__ import absolute_import
+
 
 import unittest
 import json