diff options
author | Dan Klein <danklei@cisco.com> | 2015-10-04 17:21:14 +0300 |
---|---|---|
committer | Dan Klein <danklei@cisco.com> | 2015-10-04 17:21:14 +0300 |
commit | 7e1bf3602241fb881531965813c0b6ad09790bee (patch) | |
tree | 915722375bfe49a79aaf8c180a3212c211f2e278 /scripts | |
parent | 2af9cd559d9c86e42824e920b5d9168584216e86 (diff) |
Replaced "outer_packages" with "external_packages" to avoid naming collision
Diffstat (limited to 'scripts')
-rwxr-xr-x[-rw-r--r--] | scripts/automation/trex_control_plane/client_utils/external_packages.py (renamed from scripts/automation/trex_control_plane/client_utils/outer_packages.py) | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scripts/automation/trex_control_plane/client_utils/outer_packages.py b/scripts/automation/trex_control_plane/client_utils/external_packages.py index a6c9a2eb..f8de0323 100644..100755 --- a/scripts/automation/trex_control_plane/client_utils/outer_packages.py +++ b/scripts/automation/trex_control_plane/client_utils/external_packages.py @@ -12,7 +12,6 @@ CLIENT_UTILS_MODULES = ['zmq', 'dpkt-1.8.6' ] - def import_client_utils_modules(): # must be in a higher priority sys.path.insert(0, PATH_TO_PYTHON_LIB) diff --git a/scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py b/scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py index c6b22218..ebeec77e 100644..100755 --- a/scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py +++ b/scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py @@ -1,6 +1,6 @@ #!/router/bin/python -import outer_packages +import external_packages import zmq import json import general_utils |