diff options
| author | Satoshi Kobayashi <satoshi-k@stratosphere.co.jp> | 2015-04-14 13:18:18 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-04-17 07:46:31 +0900 |
| commit | 87a051889ee9afda1467b110da6178188b8d9ca5 (patch) | |
| tree | 9cb0ee871cbcc3b0fedf67ffa098d1ab29ffb1e9 | |
| parent | fad258d458f5e2099c6facf092d1d51eaebae55d (diff) | |
'long' has been deprecated in Python 3
Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/tests/unit/lib/test_rpc.py | 3 | ||||
| -rw-r--r-- | ryu/tests/unit/packet/test_packet.py | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ryu/tests/unit/lib/test_rpc.py b/ryu/tests/unit/lib/test_rpc.py index d56ef846..405fbbc0 100644 --- a/ryu/tests/unit/lib/test_rpc.py +++ b/ryu/tests/unit/lib/test_rpc.py @@ -128,7 +128,8 @@ class Test_rpc(unittest.TestCase): def test_0_call_long(self): c = rpc.Client(self._client_sock) obj = 0xffffffffffffffff # max value for msgpack - assert isinstance(obj, long) + _long = int if six.PY3 else long + assert isinstance(obj, _long) result = c.call("resp", [obj]) assert result == obj assert isinstance(result, type(obj)) diff --git a/ryu/tests/unit/packet/test_packet.py b/ryu/tests/unit/packet/test_packet.py index 152c9f4f..fa1adaf9 100644 --- a/ryu/tests/unit/packet/test_packet.py +++ b/ryu/tests/unit/packet/test_packet.py @@ -21,6 +21,7 @@ import struct import array import inspect from nose.tools import * +import six from ryu.ofproto import ether, inet from ryu.lib.packet import * from ryu.lib import addrconv @@ -1483,13 +1484,14 @@ class TestPacket(unittest.TestCase): if k in llc_values]) llc_str = '%s(%s)' % (llc.llc.__name__, _llc_str) + _long = int if six.PY3 else long bpdu_values = {'flags': 0, - 'root_priority': long(32768), - 'root_system_id_extension': long(0), + 'root_priority': _long(32768), + 'root_system_id_extension': _long(0), 'root_mac_address': self.src_mac, 'root_path_cost': 0, - 'bridge_priority': long(32768), - 'bridge_system_id_extension': long(0), + 'bridge_priority': _long(32768), + 'bridge_system_id_extension': _long(0), 'bridge_mac_address': self.dst_mac, 'port_priority': 128, 'port_number': 4, |