summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIWAMOTO Toshihiro <iwamoto@valinux.co.jp>2015-06-30 17:01:52 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-07-01 10:13:22 +0900
commit7984bf50356cdace2e63522bcc5f678418a5f03f (patch)
tree999a6a1a82ead0a23f636a4ef6752e6cd0ac5911
parent093776af17582e2d420d4bd2e6ca2d2d6bd8aef1 (diff)
python3: Restore original str()s where six.binary_type shouldn't be used
This partially reverts 227b8fd984fc2fa5a37b4d8ae5d64dbd8166cc18. These tests are testing __str__ method and shouldn't have been changed. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/unit/ofproto/test_parser_v13.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ryu/tests/unit/ofproto/test_parser_v13.py b/ryu/tests/unit/ofproto/test_parser_v13.py
index dd00866f..265b28e4 100644
--- a/ryu/tests/unit/ofproto/test_parser_v13.py
+++ b/ryu/tests/unit/ofproto/test_parser_v13.py
@@ -94,7 +94,7 @@ class TestOFPMatch(unittest.TestCase):
match2 = match.from_jsondict(jsondict["OFPMatch"])
buf2 = bytearray()
match2.serialize(buf2, 0)
- eq_(six.binary_type(match), six.binary_type(match2))
+ eq_(str(match), str(match2))
eq_(buf, buf2)
# set_vlan_vid
@@ -139,7 +139,7 @@ class TestOFPMatch(unittest.TestCase):
match2 = match.from_jsondict(jsondict["OFPMatch"])
buf2 = bytearray()
match2.serialize(buf2, 0)
- eq_(six.binary_type(match), six.binary_type(match2))
+ eq_(str(match), str(match2))
eq_(buf, buf2)
def test_set_vlan_vid_mid(self):