From 3028b4751619d996758ca9c68b791e9e0b1016dc Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 14 Oct 2015 12:06:15 +0200 Subject: [PATCH] reinstate import of print_function in py3 so as to shorten the distance between both branches --- examples/ccn_emu_live/dce.py | 2 +- examples/ccn_emu_live/planetlab.py | 2 +- examples/ccn_emu_live/planetlab_4_nodes_linear.py | 2 +- examples/dce/custom_dlm_ping.py | 2 +- examples/dce/custom_local_csma_ping.py | 2 +- examples/dce/custom_local_p2p_ccn.py | 2 +- examples/dce/custom_local_p2p_ping.py | 2 +- examples/dce/custom_local_wifi_ping.py | 2 +- examples/dce/wrapped_local_p2p_ccncat.py | 2 +- examples/dce/wrapped_local_p2p_ccnpeek.py | 2 +- examples/dce/wrapped_local_p2p_ping.py | 2 +- examples/linux/ccn_simple_transfer.py | 2 +- examples/linux/ccn_transfer_using_linuxapp.py | 2 +- examples/linux/hello_world.py | 2 +- examples/linux/netcat_file_transfer.py | 2 +- examples/linux/vlc_streaming.py | 2 +- examples/netns/local_switch_ping.py | 2 +- examples/ns3/local_csma_p2p_star_ping.py | 2 +- examples/ns3/local_csma_ping.py | 2 +- examples/ns3/local_mobile_wifi_ping.py | 2 +- examples/ns3/local_p2p_ping.py | 2 +- examples/ns3/local_wifi_ping.py | 2 +- examples/ns3/multi_host/distributed.py | 2 +- examples/ns3/multi_host/hybrid.py | 2 +- examples/ns3/multi_host/parallel.py | 2 +- examples/ns3/remote_p2p_ping.py | 2 +- examples/omf/iminds_omf6_ping.py | 2 +- examples/omf/iminds_omf6_vlc.py | 2 +- examples/omf/nitos_omf6_ping.py | 2 +- examples/omf/nitos_omf6_vlc.py | 2 +- examples/omf/nitos_testbed_bootstrap.py | 2 +- examples/omf/testing/nitos_omf5_ping.py | 2 +- examples/openvswitch/ovs_ping.py | 2 +- examples/openvswitch/ovs_ping_2_switches.py | 2 +- examples/openvswitch/ovs_ping_3_switches.py | 2 +- examples/planetlab/ccn_simple_transfer.py | 2 +- examples/planetlab/ping.py | 2 +- examples/planetlab/ping_with_filters.py | 2 +- examples/planetlab/select_nodes.py | 2 +- examples/planetlab/update_fedora_repo.py | 2 +- src/nepi/__init__.py | 2 +- src/nepi/data/processing/ccn/parser.py | 2 +- src/nepi/resources/linux/scripts/linux-tap-create.py | 2 +- src/nepi/resources/linux/scripts/linux-tap-delete.py | 2 +- src/nepi/resources/linux/scripts/tunchannel.py | 2 +- src/nepi/resources/ns3/resource_manager_generator.py | 2 +- src/nepi/resources/omf/application.py | 2 +- src/nepi/resources/planetlab/scripts/pl-vif-create.py | 2 +- src/nepi/resources/planetlab/scripts/pl-vif-down.py | 2 +- src/nepi/resources/planetlab/sfa_node.py | 2 +- src/nepi/util/manifoldapi.py | 1 + src/nepi/util/parsers/xml_parser.py | 2 +- src/nepi/util/statfuncs.py | 2 +- test/lib/test_utils.py | 2 +- test/resources/linux/ccn/ccnpeek.py | 2 +- test/resources/linux/netns/netnsclient.py | 2 +- test/resources/linux/netns/netnsemulation.py | 2 +- test/resources/linux/ns3/cross_ns3_linux_tuntapfdlink_ping.py | 2 +- test/resources/linux/ns3/ns3fdnetdevice.py | 2 +- test/resources/linux/ns3/ns3simulation.py | 2 +- test/resources/linux/ns3/serialization.py | 2 +- test/resources/linux/udptunnel.py | 2 +- test/resources/ns3/ns3wrapper.py | 4 ++-- test/resources/omf/set_hook.py | 2 +- 64 files changed, 65 insertions(+), 64 deletions(-) diff --git a/examples/ccn_emu_live/dce.py b/examples/ccn_emu_live/dce.py index b01f37c9..ef56243f 100644 --- a/examples/ccn_emu_live/dce.py +++ b/examples/ccn_emu_live/dce.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.runner import ExperimentRunner diff --git a/examples/ccn_emu_live/planetlab.py b/examples/ccn_emu_live/planetlab.py index f88be44c..fc165604 100644 --- a/examples/ccn_emu_live/planetlab.py +++ b/examples/ccn_emu_live/planetlab.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.runner import ExperimentRunner diff --git a/examples/ccn_emu_live/planetlab_4_nodes_linear.py b/examples/ccn_emu_live/planetlab_4_nodes_linear.py index 12f81c1a..bb3b449a 100644 --- a/examples/ccn_emu_live/planetlab_4_nodes_linear.py +++ b/examples/ccn_emu_live/planetlab_4_nodes_linear.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.runner import ExperimentRunner diff --git a/examples/dce/custom_dlm_ping.py b/examples/dce/custom_dlm_ping.py index 89900b22..69f69e15 100644 --- a/examples/dce/custom_dlm_ping.py +++ b/examples/dce/custom_dlm_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/dce/custom_local_csma_ping.py b/examples/dce/custom_local_csma_ping.py index fcdaca3f..54085ab8 100644 --- a/examples/dce/custom_local_csma_ping.py +++ b/examples/dce/custom_local_csma_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/dce/custom_local_p2p_ccn.py b/examples/dce/custom_local_p2p_ccn.py index d5e0b402..243470f0 100644 --- a/examples/dce/custom_local_p2p_ccn.py +++ b/examples/dce/custom_local_p2p_ccn.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/dce/custom_local_p2p_ping.py b/examples/dce/custom_local_p2p_ping.py index 8abac0a3..f99ac7bc 100644 --- a/examples/dce/custom_local_p2p_ping.py +++ b/examples/dce/custom_local_p2p_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/dce/custom_local_wifi_ping.py b/examples/dce/custom_local_wifi_ping.py index ddcd22c1..c751b5d9 100644 --- a/examples/dce/custom_local_wifi_ping.py +++ b/examples/dce/custom_local_wifi_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/dce/wrapped_local_p2p_ccncat.py b/examples/dce/wrapped_local_p2p_ccncat.py index d6028441..b85bdffc 100644 --- a/examples/dce/wrapped_local_p2p_ccncat.py +++ b/examples/dce/wrapped_local_p2p_ccncat.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/dce/wrapped_local_p2p_ccnpeek.py b/examples/dce/wrapped_local_p2p_ccnpeek.py index e1dd1188..0ba078c2 100644 --- a/examples/dce/wrapped_local_p2p_ccnpeek.py +++ b/examples/dce/wrapped_local_p2p_ccnpeek.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/dce/wrapped_local_p2p_ping.py b/examples/dce/wrapped_local_p2p_ping.py index 92c9f65f..cdcfd6b4 100644 --- a/examples/dce/wrapped_local_p2p_ping.py +++ b/examples/dce/wrapped_local_p2p_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/linux/ccn_simple_transfer.py b/examples/linux/ccn_simple_transfer.py index 6473ff9d..ccf92eb2 100644 --- a/examples/linux/ccn_simple_transfer.py +++ b/examples/linux/ccn_simple_transfer.py @@ -31,7 +31,7 @@ # 0 ------- network -------- 1 # - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/linux/ccn_transfer_using_linuxapp.py b/examples/linux/ccn_transfer_using_linuxapp.py index a22e561e..8bf7cfc0 100644 --- a/examples/linux/ccn_transfer_using_linuxapp.py +++ b/examples/linux/ccn_transfer_using_linuxapp.py @@ -40,7 +40,7 @@ # $ cd # python examples/linux/ccn_advanced_transfer.py -a -b -u -i - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.resource import ResourceAction, ResourceState diff --git a/examples/linux/hello_world.py b/examples/linux/hello_world.py index 25536507..2e026b5b 100644 --- a/examples/linux/hello_world.py +++ b/examples/linux/hello_world.py @@ -22,7 +22,7 @@ # $ cd # python examples/linux/hello_world.py -a -u -i - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/linux/netcat_file_transfer.py b/examples/linux/netcat_file_transfer.py index e632c447..6d43764a 100644 --- a/examples/linux/netcat_file_transfer.py +++ b/examples/linux/netcat_file_transfer.py @@ -24,7 +24,7 @@ # $ cd # python examples/linux/netcat_file_transfer.py -a -b -u -i - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.resource import ResourceAction, ResourceState diff --git a/examples/linux/vlc_streaming.py b/examples/linux/vlc_streaming.py index d888e3bd..9f31286e 100644 --- a/examples/linux/vlc_streaming.py +++ b/examples/linux/vlc_streaming.py @@ -21,7 +21,7 @@ # $ cd # python examples/linux/vlc_streaming.py -a -b -u -i - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.resource import ResourceState, ResourceAction diff --git a/examples/netns/local_switch_ping.py b/examples/netns/local_switch_ping.py index 7f371683..e69a7e83 100644 --- a/examples/netns/local_switch_ping.py +++ b/examples/netns/local_switch_ping.py @@ -21,7 +21,7 @@ # This example must be executed as root: # $ sudo PYTHONPATH=$PYTHONPATH:src python examples/netns/local_switch_ping.py - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/ns3/local_csma_p2p_star_ping.py b/examples/ns3/local_csma_p2p_star_ping.py index f7e45903..5d7593f6 100644 --- a/examples/ns3/local_csma_p2p_star_ping.py +++ b/examples/ns3/local_csma_p2p_star_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function """ network topology: diff --git a/examples/ns3/local_csma_ping.py b/examples/ns3/local_csma_ping.py index a63e8ba3..97afd3fb 100644 --- a/examples/ns3/local_csma_ping.py +++ b/examples/ns3/local_csma_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/ns3/local_mobile_wifi_ping.py b/examples/ns3/local_mobile_wifi_ping.py index 8beefdba..f51986b4 100644 --- a/examples/ns3/local_mobile_wifi_ping.py +++ b/examples/ns3/local_mobile_wifi_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function """ network topology: diff --git a/examples/ns3/local_p2p_ping.py b/examples/ns3/local_p2p_ping.py index ff93f167..1741cddd 100644 --- a/examples/ns3/local_p2p_ping.py +++ b/examples/ns3/local_p2p_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/ns3/local_wifi_ping.py b/examples/ns3/local_wifi_ping.py index 4d038c55..8c17d7fa 100644 --- a/examples/ns3/local_wifi_ping.py +++ b/examples/ns3/local_wifi_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/ns3/multi_host/distributed.py b/examples/ns3/multi_host/distributed.py index 5c7a28f3..c3aef65a 100644 --- a/examples/ns3/multi_host/distributed.py +++ b/examples/ns3/multi_host/distributed.py @@ -37,7 +37,7 @@ # PYTHONPATH=$PYTHONPATH:src python examples/ns3/multi_host/ditributed.py # - +from __future__ import print_function import os diff --git a/examples/ns3/multi_host/hybrid.py b/examples/ns3/multi_host/hybrid.py index f67bf3b0..630fec2d 100644 --- a/examples/ns3/multi_host/hybrid.py +++ b/examples/ns3/multi_host/hybrid.py @@ -38,7 +38,7 @@ # PYTHONPATH=$PYTHONPATH:src python examples/ns3/multi_host/hybrid.py # - +from __future__ import print_function import os diff --git a/examples/ns3/multi_host/parallel.py b/examples/ns3/multi_host/parallel.py index e9736df3..fa53457c 100644 --- a/examples/ns3/multi_host/parallel.py +++ b/examples/ns3/multi_host/parallel.py @@ -37,7 +37,7 @@ # PYTHONPATH=$PYTHONPATH:src python examples/ns3/multi_host/parallel.py # - +from __future__ import print_function import os diff --git a/examples/ns3/remote_p2p_ping.py b/examples/ns3/remote_p2p_ping.py index cbbd0d77..57bda491 100644 --- a/examples/ns3/remote_p2p_ping.py +++ b/examples/ns3/remote_p2p_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/omf/iminds_omf6_ping.py b/examples/omf/iminds_omf6_ping.py index 825d41a6..d5e02c73 100644 --- a/examples/omf/iminds_omf6_ping.py +++ b/examples/omf/iminds_omf6_ping.py @@ -44,7 +44,7 @@ # - t3 (t2 + 2s) : Kill the application # - +from __future__ import print_function from nepi.execution.resource import ResourceAction, ResourceState from nepi.execution.ec import ExperimentController diff --git a/examples/omf/iminds_omf6_vlc.py b/examples/omf/iminds_omf6_vlc.py index fedee24c..b312abdb 100644 --- a/examples/omf/iminds_omf6_vlc.py +++ b/examples/omf/iminds_omf6_vlc.py @@ -45,7 +45,7 @@ # - t3 (t2 + 2s) : Kill the application # - +from __future__ import print_function from nepi.execution.resource import ResourceAction, ResourceState from nepi.execution.ec import ExperimentController diff --git a/examples/omf/nitos_omf6_ping.py b/examples/omf/nitos_omf6_ping.py index 696e4308..6deaf18e 100644 --- a/examples/omf/nitos_omf6_ping.py +++ b/examples/omf/nitos_omf6_ping.py @@ -45,7 +45,7 @@ # - t3 (t2 + 2s) : Kill the application # - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.resource import ResourceAction, ResourceState diff --git a/examples/omf/nitos_omf6_vlc.py b/examples/omf/nitos_omf6_vlc.py index 4e4a1dd3..c6c2600d 100644 --- a/examples/omf/nitos_omf6_vlc.py +++ b/examples/omf/nitos_omf6_vlc.py @@ -46,7 +46,7 @@ # - t3 (t2 + 2s) : Kill the application # - +from __future__ import print_function from nepi.execution.resource import ResourceAction, ResourceState from nepi.execution.ec import ExperimentController diff --git a/examples/omf/nitos_testbed_bootstrap.py b/examples/omf/nitos_testbed_bootstrap.py index b4905aa6..6d70818d 100644 --- a/examples/omf/nitos_testbed_bootstrap.py +++ b/examples/omf/nitos_testbed_bootstrap.py @@ -30,7 +30,7 @@ # python examples/linux/nitos_testbed_bootstrap.py -H -U -i -g -u # - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.resource import ResourceAction, ResourceState diff --git a/examples/omf/testing/nitos_omf5_ping.py b/examples/omf/testing/nitos_omf5_ping.py index 8498d60d..44d0ae98 100644 --- a/examples/omf/testing/nitos_omf5_ping.py +++ b/examples/omf/testing/nitos_omf5_ping.py @@ -42,7 +42,7 @@ # # - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.resource import ResourceAction, ResourceState diff --git a/examples/openvswitch/ovs_ping.py b/examples/openvswitch/ovs_ping.py index 5de45db1..7f508468 100644 --- a/examples/openvswitch/ovs_ping.py +++ b/examples/openvswitch/ovs_ping.py @@ -32,7 +32,7 @@ # $ PYTHONPATH=$PYTHONPATH:src/ python examples/openvswitch/ovs_ping.py -n "192.168.3.0/24" -s -i /~/.ssh/id_rsa # - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/openvswitch/ovs_ping_2_switches.py b/examples/openvswitch/ovs_ping_2_switches.py index 6fc773bb..a28bef20 100644 --- a/examples/openvswitch/ovs_ping_2_switches.py +++ b/examples/openvswitch/ovs_ping_2_switches.py @@ -33,7 +33,7 @@ # $ PYTHONPATH=$PYTHONPATH:src/ python examples/openvswitch/ovs_ping_2_switches.py -n "192.168.3.0/24" -C "1.1.1.1" -s -i /~/.ssh/id_rsa # - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/openvswitch/ovs_ping_3_switches.py b/examples/openvswitch/ovs_ping_3_switches.py index 510c9e66..1562d709 100644 --- a/examples/openvswitch/ovs_ping_3_switches.py +++ b/examples/openvswitch/ovs_ping_3_switches.py @@ -32,7 +32,7 @@ # $ PYTHONPATH=$PYTHONPATH:src/ python examples/openvswitch/ovs_ping_3_switches.py -n "192.168.3.0/24" -C "1.1.1.1" -s -i /~/.ssh/id_rsa # - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/planetlab/ccn_simple_transfer.py b/examples/planetlab/ccn_simple_transfer.py index 33635570..fabbcbc5 100644 --- a/examples/planetlab/ccn_simple_transfer.py +++ b/examples/planetlab/ccn_simple_transfer.py @@ -31,7 +31,7 @@ # 0 ------- network -------- 1 # - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/planetlab/ping.py b/examples/planetlab/ping.py index 5f07bf04..f35ea702 100644 --- a/examples/planetlab/ping.py +++ b/examples/planetlab/ping.py @@ -24,7 +24,7 @@ # $ cd # python examples/planetlab/ping.py -s -u -p -k - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/planetlab/ping_with_filters.py b/examples/planetlab/ping_with_filters.py index f0e498f0..f21d282a 100644 --- a/examples/planetlab/ping_with_filters.py +++ b/examples/planetlab/ping_with_filters.py @@ -22,7 +22,7 @@ # $ cd # python examples/planetlab/ping_with_filters.py -s -u -p -k - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.resource import ResourceAction, ResourceState diff --git a/examples/planetlab/select_nodes.py b/examples/planetlab/select_nodes.py index a0aec7d1..465e9493 100644 --- a/examples/planetlab/select_nodes.py +++ b/examples/planetlab/select_nodes.py @@ -22,7 +22,7 @@ # $ cd # python examples/planetlab/select_nodes.py -s -u -p -k -c -o -n - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/examples/planetlab/update_fedora_repo.py b/examples/planetlab/update_fedora_repo.py index f4929fbc..630fe103 100644 --- a/examples/planetlab/update_fedora_repo.py +++ b/examples/planetlab/update_fedora_repo.py @@ -27,7 +27,7 @@ # $ cd # python examples/planetlab/update_fedora_repo.py -H -s -u -p -k - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/src/nepi/__init__.py b/src/nepi/__init__.py index 8e7ff2ae..18764d03 100644 --- a/src/nepi/__init__.py +++ b/src/nepi/__init__.py @@ -16,7 +16,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function import logging import os diff --git a/src/nepi/data/processing/ccn/parser.py b/src/nepi/data/processing/ccn/parser.py index 1538b0c4..64e2ada6 100644 --- a/src/nepi/data/processing/ccn/parser.py +++ b/src/nepi/data/processing/ccn/parser.py @@ -40,7 +40,7 @@ # \ nid3.log # - +from __future__ import print_function import collections import functools diff --git a/src/nepi/resources/linux/scripts/linux-tap-create.py b/src/nepi/resources/linux/scripts/linux-tap-create.py index 035f1a69..256aff61 100644 --- a/src/nepi/resources/linux/scripts/linux-tap-create.py +++ b/src/nepi/resources/linux/scripts/linux-tap-create.py @@ -16,7 +16,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function import base64 import fcntl diff --git a/src/nepi/resources/linux/scripts/linux-tap-delete.py b/src/nepi/resources/linux/scripts/linux-tap-delete.py index 60a0e1a5..78b69c3d 100644 --- a/src/nepi/resources/linux/scripts/linux-tap-delete.py +++ b/src/nepi/resources/linux/scripts/linux-tap-delete.py @@ -16,7 +16,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function import base64 import socket diff --git a/src/nepi/resources/linux/scripts/tunchannel.py b/src/nepi/resources/linux/scripts/tunchannel.py index cca52059..6f404608 100644 --- a/src/nepi/resources/linux/scripts/tunchannel.py +++ b/src/nepi/resources/linux/scripts/tunchannel.py @@ -18,7 +18,7 @@ # Claudio Freire # - +from __future__ import print_function import select import sys diff --git a/src/nepi/resources/ns3/resource_manager_generator.py b/src/nepi/resources/ns3/resource_manager_generator.py index 3bfd08a0..6bd9b896 100644 --- a/src/nepi/resources/ns3/resource_manager_generator.py +++ b/src/nepi/resources/ns3/resource_manager_generator.py @@ -29,7 +29,7 @@ # PYTHONPATH=$PYTHONPATH:~/repos/nepi/src python src/nepi/resources/ns3/resource_manager_generator.py # - +from __future__ import print_function # Force the load of ns3 libraries from nepi.resources.ns3.ns3wrapper import load_ns3_module diff --git a/src/nepi/resources/omf/application.py b/src/nepi/resources/omf/application.py index 86c82cb2..03db0889 100644 --- a/src/nepi/resources/omf/application.py +++ b/src/nepi/resources/omf/application.py @@ -17,7 +17,7 @@ # Author: Alina Quereilhac # Julien Tribino - +from __future__ import print_function import os diff --git a/src/nepi/resources/planetlab/scripts/pl-vif-create.py b/src/nepi/resources/planetlab/scripts/pl-vif-create.py index bd45a0ce..6b722787 100644 --- a/src/nepi/resources/planetlab/scripts/pl-vif-create.py +++ b/src/nepi/resources/planetlab/scripts/pl-vif-create.py @@ -16,7 +16,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function import base64 import errno diff --git a/src/nepi/resources/planetlab/scripts/pl-vif-down.py b/src/nepi/resources/planetlab/scripts/pl-vif-down.py index be125756..f766a379 100644 --- a/src/nepi/resources/planetlab/scripts/pl-vif-down.py +++ b/src/nepi/resources/planetlab/scripts/pl-vif-down.py @@ -16,7 +16,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function import base64 import socket diff --git a/src/nepi/resources/planetlab/sfa_node.py b/src/nepi/resources/planetlab/sfa_node.py index a0dca11e..e05a3a78 100644 --- a/src/nepi/resources/planetlab/sfa_node.py +++ b/src/nepi/resources/planetlab/sfa_node.py @@ -16,7 +16,7 @@ # # Author: Lucia Guevgeozian - +from __future__ import print_function from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import ResourceManager, clsinit_copy, \ diff --git a/src/nepi/util/manifoldapi.py b/src/nepi/util/manifoldapi.py index 43acf580..d9141b66 100644 --- a/src/nepi/util/manifoldapi.py +++ b/src/nepi/util/manifoldapi.py @@ -16,6 +16,7 @@ # # Author: Lucia Guevgeozian Odizzio +from __future__ import print_function import xmlrpc.client diff --git a/src/nepi/util/parsers/xml_parser.py b/src/nepi/util/parsers/xml_parser.py index b42d39ba..d6b14cd4 100644 --- a/src/nepi/util/parsers/xml_parser.py +++ b/src/nepi/util/parsers/xml_parser.py @@ -16,7 +16,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.util.netgraph import NetGraph, TopologyType from nepi.util.timefuncs import stformat, tsformat diff --git a/src/nepi/util/statfuncs.py b/src/nepi/util/statfuncs.py index b500664a..f6a8b547 100644 --- a/src/nepi/util/statfuncs.py +++ b/src/nepi/util/statfuncs.py @@ -16,7 +16,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function import math import numpy diff --git a/test/lib/test_utils.py b/test/lib/test_utils.py index beea1182..cd67dcdd 100644 --- a/test/lib/test_utils.py +++ b/test/lib/test_utils.py @@ -16,7 +16,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.resources.linux.node import LinuxNode diff --git a/test/resources/linux/ccn/ccnpeek.py b/test/resources/linux/ccn/ccnpeek.py index 0384f3be..22acdbb7 100755 --- a/test/resources/linux/ccn/ccnpeek.py +++ b/test/resources/linux/ccn/ccnpeek.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.resource import ResourceState, ResourceAction from nepi.execution.ec import ExperimentController diff --git a/test/resources/linux/netns/netnsclient.py b/test/resources/linux/netns/netnsclient.py index 0918d3ba..48e6bf6d 100755 --- a/test/resources/linux/netns/netnsclient.py +++ b/test/resources/linux/netns/netnsclient.py @@ -20,7 +20,7 @@ # Test based on netns test/test_core.py file test_run_ping_routing test # - +from __future__ import print_function from nepi.resources.netns.netnsserver import run_server from nepi.resources.linux.netns.netnsclient import LinuxNetNSClient diff --git a/test/resources/linux/netns/netnsemulation.py b/test/resources/linux/netns/netnsemulation.py index 56577740..48186b88 100755 --- a/test/resources/linux/netns/netnsemulation.py +++ b/test/resources/linux/netns/netnsemulation.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.trace import TraceAttr diff --git a/test/resources/linux/ns3/cross_ns3_linux_tuntapfdlink_ping.py b/test/resources/linux/ns3/cross_ns3_linux_tuntapfdlink_ping.py index ccaaf51a..ac03fdee 100755 --- a/test/resources/linux/ns3/cross_ns3_linux_tuntapfdlink_ping.py +++ b/test/resources/linux/ns3/cross_ns3_linux_tuntapfdlink_ping.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.resource import ResourceState, ResourceAction diff --git a/test/resources/linux/ns3/ns3fdnetdevice.py b/test/resources/linux/ns3/ns3fdnetdevice.py index 12f3b612..67236295 100755 --- a/test/resources/linux/ns3/ns3fdnetdevice.py +++ b/test/resources/linux/ns3/ns3fdnetdevice.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.trace import TraceAttr diff --git a/test/resources/linux/ns3/ns3simulation.py b/test/resources/linux/ns3/ns3simulation.py index 621bfb75..f00dcade 100755 --- a/test/resources/linux/ns3/ns3simulation.py +++ b/test/resources/linux/ns3/ns3simulation.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.trace import TraceAttr diff --git a/test/resources/linux/ns3/serialization.py b/test/resources/linux/ns3/serialization.py index eb310d75..2685bb88 100755 --- a/test/resources/linux/ns3/serialization.py +++ b/test/resources/linux/ns3/serialization.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController from nepi.execution.trace import TraceAttr diff --git a/test/resources/linux/udptunnel.py b/test/resources/linux/udptunnel.py index 25d619ec..2963f904 100755 --- a/test/resources/linux/udptunnel.py +++ b/test/resources/linux/udptunnel.py @@ -17,7 +17,7 @@ # # Author: Alina Quereilhac - +from __future__ import print_function from nepi.execution.ec import ExperimentController diff --git a/test/resources/ns3/ns3wrapper.py b/test/resources/ns3/ns3wrapper.py index c6bff048..2051fddd 100755 --- a/test/resources/ns3/ns3wrapper.py +++ b/test/resources/ns3/ns3wrapper.py @@ -28,11 +28,11 @@ # # node n0 sends IGMP traffic to node n3 - +from __future__ import print_function from nepi.resources.ns3.ns3wrapper import NS3Wrapper -import io +import StringIO import subprocess import sys import time diff --git a/test/resources/omf/set_hook.py b/test/resources/omf/set_hook.py index f01ec3e2..1ac06930 100755 --- a/test/resources/omf/set_hook.py +++ b/test/resources/omf/set_hook.py @@ -17,7 +17,7 @@ # # Author: Julien Tribino - +from __future__ import print_function from nepi.execution.resource import (ResourceFactory, clsinit_copy, ResourceManager, ResourceAction, ResourceState) -- 2.47.0