From 8ac077a72192de60e39940dd09d539355ed58430 Mon Sep 17 00:00:00 2001 From: Bob Lantz Date: Mon, 8 Aug 2016 15:27:44 -0700 Subject: [PATCH] Remove "from __future__ import print" This was well-intentioned, but it causes more trouble than it's worth. Fixes #652 --- bin/mn | 1 - examples/baresshd.py | 1 - examples/cluster.py | 1 - examples/controllers2.py | 1 - examples/cpu.py | 1 - examples/linearbandwidth.py | 1 - examples/linuxrouter.py | 1 - examples/miniedit.py | 1 - examples/mobility.py | 1 - examples/multiping.py | 1 - examples/multipoll.py | 1 - examples/nat.py | 1 - examples/numberedports.py | 1 - examples/popen.py | 1 - examples/popenpoll.py | 1 - examples/scratchnet.py | 1 - examples/simpleperf.py | 1 - examples/sshd.py | 1 - examples/test/test_sshd.py | 1 - examples/treeping64.py | 1 - mininet/cli.py | 1 - mininet/util.py | 1 - util/versioncheck.py | 1 - util/vm/build.py | 1 - 24 files changed, 24 deletions(-) diff --git a/bin/mn b/bin/mn index dc1707b..0fc3374 100755 --- a/bin/mn +++ b/bin/mn @@ -11,7 +11,6 @@ Example to pull custom params (topo, switch, etc.) from a file: sudo mn --custom ~/mininet/custom/custom_example.py """ -from __future__ import print_function from optparse import OptionParser import os import sys diff --git a/examples/baresshd.py b/examples/baresshd.py index 4d84a11..9d349f3 100755 --- a/examples/baresshd.py +++ b/examples/baresshd.py @@ -2,7 +2,6 @@ "This example doesn't use OpenFlow, but attempts to run sshd in a namespace." -from __future__ import print_function import sys from mininet.node import Host diff --git a/examples/cluster.py b/examples/cluster.py index 3639f3e..afa525f 100755 --- a/examples/cluster.py +++ b/examples/cluster.py @@ -74,7 +74,6 @@ Things to do: - hifi support (e.g. delay compensation) """ -from __future__ import print_function from mininet.node import Node, Host, OVSSwitch, Controller from mininet.link import Link, Intf diff --git a/examples/controllers2.py b/examples/controllers2.py index 4bc3051..eaa54c2 100755 --- a/examples/controllers2.py +++ b/examples/controllers2.py @@ -11,7 +11,6 @@ Note that one could also create a custom switch class and pass it into the Mininet() constructor. """ -from __future__ import print_function from mininet.net import Mininet from mininet.node import Controller, OVSSwitch diff --git a/examples/cpu.py b/examples/cpu.py index 7397278..7d03199 100755 --- a/examples/cpu.py +++ b/examples/cpu.py @@ -4,7 +4,6 @@ cpu.py: test iperf bandwidth for varying cpu limits """ -from __future__ import print_function from mininet.net import Mininet from mininet.node import CPULimitedHost diff --git a/examples/linearbandwidth.py b/examples/linearbandwidth.py index 684c143..394fa75 100755 --- a/examples/linearbandwidth.py +++ b/examples/linearbandwidth.py @@ -23,7 +23,6 @@ of switches, this example demonstrates: """ -from __future__ import print_function from mininet.net import Mininet from mininet.node import UserSwitch, OVSKernelSwitch, Controller diff --git a/examples/linuxrouter.py b/examples/linuxrouter.py index 934e054..2e7ea7d 100755 --- a/examples/linuxrouter.py +++ b/examples/linuxrouter.py @@ -27,7 +27,6 @@ Additional routes may be added to the router or hosts by executing 'ip route' or 'route' commands on the router or hosts. """ -from __future__ import print_function from mininet.topo import Topo from mininet.net import Mininet diff --git a/examples/miniedit.py b/examples/miniedit.py index 2741061..7d52f60 100755 --- a/examples/miniedit.py +++ b/examples/miniedit.py @@ -20,7 +20,6 @@ OpenFlow icon from https://www.opennetworking.org/ MINIEDIT_VERSION = '2.2.0.1' -from __future__ import print_function from optparse import OptionParser # from Tkinter import * from Tkinter import ( Frame, Label, LabelFrame, Entry, OptionMenu, Checkbutton, diff --git a/examples/mobility.py b/examples/mobility.py index 175f837..2643735 100755 --- a/examples/mobility.py +++ b/examples/mobility.py @@ -19,7 +19,6 @@ to-do: - think about clearing last hop - why doesn't that work? """ -from __future__ import print_function from mininet.net import Mininet from mininet.node import OVSSwitch diff --git a/examples/multiping.py b/examples/multiping.py index 24dc6d1..73ec614 100755 --- a/examples/multiping.py +++ b/examples/multiping.py @@ -8,7 +8,6 @@ multiple hosts and monitor their output interactively for a period= of time. """ -from __future__ import print_function from mininet.net import Mininet from mininet.node import Node diff --git a/examples/multipoll.py b/examples/multipoll.py index 234cb6d..6bff394 100755 --- a/examples/multipoll.py +++ b/examples/multipoll.py @@ -5,7 +5,6 @@ Simple example of sending output to multiple files and monitoring them """ -from __future__ import print_function from mininet.topo import SingleSwitchTopo from mininet.net import Mininet diff --git a/examples/nat.py b/examples/nat.py index 4fa8e71..fbbe03e 100755 --- a/examples/nat.py +++ b/examples/nat.py @@ -4,7 +4,6 @@ Example to create a Mininet topology and connect it to the internet via NAT """ -from __future__ import print_function from mininet.cli import CLI from mininet.log import lg diff --git a/examples/numberedports.py b/examples/numberedports.py index afbc896..4a26cbc 100755 --- a/examples/numberedports.py +++ b/examples/numberedports.py @@ -6,7 +6,6 @@ Validate that the port numbers match to the interface name, and that the ovs ports match the mininet ports. """ -from __future__ import print_function from mininet.net import Mininet from mininet.node import Controller diff --git a/examples/popen.py b/examples/popen.py index dc43f4f..42674e4 100755 --- a/examples/popen.py +++ b/examples/popen.py @@ -5,7 +5,6 @@ This example monitors a number of hosts using host.popen() and pmonitor() """ -from __future__ import print_function from mininet.net import Mininet from mininet.node import CPULimitedHost diff --git a/examples/popenpoll.py b/examples/popenpoll.py index 3015563..ddfcc18 100755 --- a/examples/popenpoll.py +++ b/examples/popenpoll.py @@ -2,7 +2,6 @@ "Monitor multiple hosts using popen()/pmonitor()" -from __future__ import print_function from mininet.net import Mininet from mininet.topo import SingleSwitchTopo diff --git a/examples/scratchnet.py b/examples/scratchnet.py index 994cb2b..46efa5a 100755 --- a/examples/scratchnet.py +++ b/examples/scratchnet.py @@ -8,7 +8,6 @@ but it exposes the configuration details and allows customization. For most tasks, the higher-level API will be preferable. """ -from __future__ import print_function from mininet.net import Mininet from mininet.node import Node diff --git a/examples/simpleperf.py b/examples/simpleperf.py index 273e819..9d00cbc 100755 --- a/examples/simpleperf.py +++ b/examples/simpleperf.py @@ -9,7 +9,6 @@ iperf will hang indefinitely if the TCP handshake fails to complete. """ -from __future__ import print_function from mininet.topo import Topo from mininet.net import Mininet diff --git a/examples/sshd.py b/examples/sshd.py index 01a81e4..41d0e1a 100755 --- a/examples/sshd.py +++ b/examples/sshd.py @@ -16,7 +16,6 @@ demonstrates: - running server processes (sshd in this case) on hosts """ -from __future__ import print_function import sys from mininet.net import Mininet diff --git a/examples/test/test_sshd.py b/examples/test/test_sshd.py index 507d578..6a39bba 100755 --- a/examples/test/test_sshd.py +++ b/examples/test/test_sshd.py @@ -4,7 +4,6 @@ Test for sshd.py """ -from __future__ import print_function import unittest import pexpect from mininet.clean import sh diff --git a/examples/treeping64.py b/examples/treeping64.py index 831989a..c97e3c3 100755 --- a/examples/treeping64.py +++ b/examples/treeping64.py @@ -2,7 +2,6 @@ "Create a 64-node tree network, and test connectivity using ping." -from __future__ import print_function from mininet.log import setLogLevel from mininet.node import UserSwitch, OVSKernelSwitch # , KernelSwitch diff --git a/mininet/cli.py b/mininet/cli.py index b4dc37a..574e946 100644 --- a/mininet/cli.py +++ b/mininet/cli.py @@ -25,7 +25,6 @@ list all nodes ('nodes'), to print out the network topology and bandwidth ('iperf'.) """ -from __future__ import print_function from subprocess import call from cmd import Cmd from os import isatty diff --git a/mininet/util.py b/mininet/util.py index ceee161..c44627a 100644 --- a/mininet/util.py +++ b/mininet/util.py @@ -1,6 +1,5 @@ "Utility functions for Mininet." -from __future__ import print_function from mininet.log import output, info, error, warn, debug diff --git a/util/versioncheck.py b/util/versioncheck.py index 39184de..6bbec09 100755 --- a/util/versioncheck.py +++ b/util/versioncheck.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import print_function from subprocess import check_output as co from sys import exit diff --git a/util/vm/build.py b/util/vm/build.py index 0bb56a8..9fa1f77 100755 --- a/util/vm/build.py +++ b/util/vm/build.py @@ -26,7 +26,6 @@ Basic idea: """ -from __future__ import print_function import os from os import stat, path from stat import ST_MODE, ST_SIZE