summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSatoshi KOBAYASHI <satoshi-k@iij.ad.jp>2015-11-10 12:33:26 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-11-13 15:36:51 +0900
commit3a0ea9e2bb2fcd4dfb779f2feb2a67df8578987a (patch)
treef3f53b2d117842b18d3542b7d386371252f9c8a3
parent466cf26d9254f0ae23bec0dd5708d7abdde7266b (diff)
python3: import __future__ for just in case
Signed-off-by: Satoshi KOBAYASHI <satoshi-k@iij.ad.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/app/simple_switch_snort.py1
-rwxr-xr-xryu/cmd/of_config_cli.py2
-rwxr-xr-xryu/cmd/rpc_cli.py2
-rw-r--r--ryu/lib/ovs/vsctl.py2
-rw-r--r--ryu/lib/stringify.py2
-rwxr-xr-xryu/tests/integrated/run_tests_with_ovs12.py2
-rw-r--r--ryu/tests/integrated/test_of_config.py2
-rw-r--r--ryu/tests/integrated/vrrp_common.py2
-rw-r--r--ryu/tests/packet_data_generator3/gen.py3
-rw-r--r--ryu/tests/unit/lib/test_ip.py2
-rw-r--r--ryu/tests/unit/lib/test_ofctl.py2
-rw-r--r--ryu/tests/unit/lib/test_stringify.py2
-rw-r--r--ryu/tests/unit/ofproto/test_parser.py2
-rw-r--r--ryu/tests/unit/ofproto/test_parser_compat.py2
-rw-r--r--ryu/tests/unit/ofproto/test_parser_ofpmatch.py2
-rw-r--r--ryu/tests/unit/packet/test_bgp.py2
-rw-r--r--ryu/tests/unit/packet/test_vrrp.py2
17 files changed, 34 insertions, 0 deletions
diff --git a/ryu/app/simple_switch_snort.py b/ryu/app/simple_switch_snort.py
index 71fce04e..553a8bb7 100644
--- a/ryu/app/simple_switch_snort.py
+++ b/ryu/app/simple_switch_snort.py
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
import array
diff --git a/ryu/cmd/of_config_cli.py b/ryu/cmd/of_config_cli.py
index ef1bb16a..1601503c 100755
--- a/ryu/cmd/of_config_cli.py
+++ b/ryu/cmd/of_config_cli.py
@@ -23,6 +23,8 @@
# --peers=sw1=localhost:1830:username:password
# (Cmd) raw_get sw1
+from __future__ import print_function
+
import ryu.contrib
ryu.contrib.update_module_path()
diff --git a/ryu/cmd/rpc_cli.py b/ryu/cmd/rpc_cli.py
index 38c4ee62..57ad0e01 100755
--- a/ryu/cmd/rpc_cli.py
+++ b/ryu/cmd/rpc_cli.py
@@ -29,6 +29,8 @@
# NOTIFICATION from echo-server ['notify-method', ['param1', 'param2']]
# (Cmd)
+from __future__ import print_function
+
import ryu.contrib
ryu.contrib.update_module_path()
diff --git a/ryu/lib/ovs/vsctl.py b/ryu/lib/ovs/vsctl.py
index 8670eb35..8142734a 100644
--- a/ryu/lib/ovs/vsctl.py
+++ b/ryu/lib/ovs/vsctl.py
@@ -15,6 +15,8 @@
# limitations under the License.
+from __future__ import print_function
+
import itertools
import logging
import operator
diff --git a/ryu/lib/stringify.py b/ryu/lib/stringify.py
index 7d083900..8fb2c967 100644
--- a/ryu/lib/stringify.py
+++ b/ryu/lib/stringify.py
@@ -16,6 +16,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
+
import base64
import collections
import inspect
diff --git a/ryu/tests/integrated/run_tests_with_ovs12.py b/ryu/tests/integrated/run_tests_with_ovs12.py
index dc194c58..9d82d370 100755
--- a/ryu/tests/integrated/run_tests_with_ovs12.py
+++ b/ryu/tests/integrated/run_tests_with_ovs12.py
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
+
import unittest
from nose.tools import ok_, eq_, timed, nottest
diff --git a/ryu/tests/integrated/test_of_config.py b/ryu/tests/integrated/test_of_config.py
index 5a927655..6bcc7d0b 100644
--- a/ryu/tests/integrated/test_of_config.py
+++ b/ryu/tests/integrated/test_of_config.py
@@ -110,6 +110,8 @@ Here is my sys.config used for this test.
"""
+from __future__ import print_function
+
import traceback
import lxml.etree
diff --git a/ryu/tests/integrated/vrrp_common.py b/ryu/tests/integrated/vrrp_common.py
index 1f88dc0d..58621f45 100644
--- a/ryu/tests/integrated/vrrp_common.py
+++ b/ryu/tests/integrated/vrrp_common.py
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
+
import time
import random
diff --git a/ryu/tests/packet_data_generator3/gen.py b/ryu/tests/packet_data_generator3/gen.py
index 7dc95b46..416cd7fd 100644
--- a/ryu/tests/packet_data_generator3/gen.py
+++ b/ryu/tests/packet_data_generator3/gen.py
@@ -1,4 +1,7 @@
#! /usr/bin/env python
+
+from __future__ import print_function
+
import getopt
import os
import six
diff --git a/ryu/tests/unit/lib/test_ip.py b/ryu/tests/unit/lib/test_ip.py
index 5aa74109..d9716c8a 100644
--- a/ryu/tests/unit/lib/test_ip.py
+++ b/ryu/tests/unit/lib/test_ip.py
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
+
import unittest
import logging
import struct
diff --git a/ryu/tests/unit/lib/test_ofctl.py b/ryu/tests/unit/lib/test_ofctl.py
index 33c3e964..11e27f78 100644
--- a/ryu/tests/unit/lib/test_ofctl.py
+++ b/ryu/tests/unit/lib/test_ofctl.py
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
+
import unittest
import logging
import netaddr
diff --git a/ryu/tests/unit/lib/test_stringify.py b/ryu/tests/unit/lib/test_stringify.py
index 2a6e167c..46fb21f0 100644
--- a/ryu/tests/unit/lib/test_stringify.py
+++ b/ryu/tests/unit/lib/test_stringify.py
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
+
import base64
import six
import unittest
diff --git a/ryu/tests/unit/ofproto/test_parser.py b/ryu/tests/unit/ofproto/test_parser.py
index 8b2b6c09..dc2940e2 100644
--- a/ryu/tests/unit/ofproto/test_parser.py
+++ b/ryu/tests/unit/ofproto/test_parser.py
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
+
import six
import sys
import unittest
diff --git a/ryu/tests/unit/ofproto/test_parser_compat.py b/ryu/tests/unit/ofproto/test_parser_compat.py
index fc22f04f..dcca56bd 100644
--- a/ryu/tests/unit/ofproto/test_parser_compat.py
+++ b/ryu/tests/unit/ofproto/test_parser_compat.py
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
+
import six
import sys
import unittest
diff --git a/ryu/tests/unit/ofproto/test_parser_ofpmatch.py b/ryu/tests/unit/ofproto/test_parser_ofpmatch.py
index 5beaa676..3989f383 100644
--- a/ryu/tests/unit/ofproto/test_parser_ofpmatch.py
+++ b/ryu/tests/unit/ofproto/test_parser_ofpmatch.py
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
+
try:
# Python 3
from functools import reduce
diff --git a/ryu/tests/unit/packet/test_bgp.py b/ryu/tests/unit/packet/test_bgp.py
index 8b77cc63..37f0468b 100644
--- a/ryu/tests/unit/packet/test_bgp.py
+++ b/ryu/tests/unit/packet/test_bgp.py
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
+
import unittest
from nose.tools import eq_
from nose.tools import ok_
diff --git a/ryu/tests/unit/packet/test_vrrp.py b/ryu/tests/unit/packet/test_vrrp.py
index 51131278..71c52500 100644
--- a/ryu/tests/unit/packet/test_vrrp.py
+++ b/ryu/tests/unit/packet/test_vrrp.py
@@ -16,6 +16,8 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
+from __future__ import print_function
+
import unittest
import logging
import six