From 7984bf50356cdace2e63522bcc5f678418a5f03f Mon Sep 17 00:00:00 2001 From: IWAMOTO Toshihiro Date: Tue, 30 Jun 2015 17:01:52 +0900 Subject: [PATCH] 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 Signed-off-by: FUJITA Tomonori --- ryu/tests/unit/ofproto/test_parser_v13.py | 4 ++-- 1 file 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):