summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIWAMOTO Toshihiro <iwamoto@valinux.co.jp>2015-06-29 20:03:13 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-06-29 22:09:55 +0900
commit576d186351ddcf34c46bcb4732858e72b598413e (patch)
tree81bc2d3e5cc27abe99901523f49ff2e1b39445c1
parent39697ad1e751619d96cc6361dd181c4e74a1cf7b (diff)
python3: Don't use str.encode
This commit partially reverts b48fedc7295cb0c9c3fe62fc2d2f124b7fc739f8. This kind of change complicates assertion checks below. 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_v10.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ryu/tests/unit/ofproto/test_parser_v10.py b/ryu/tests/unit/ofproto/test_parser_v10.py
index e2ec6ab0..ca47d34e 100644
--- a/ryu/tests/unit/ofproto/test_parser_v10.py
+++ b/ryu/tests/unit/ofproto/test_parser_v10.py
@@ -46,7 +46,7 @@ class TestOFPPhyPort(unittest.TestCase):
buf = port_no['buf'] \
+ addrconv.mac.text_to_bin(hw_addr) \
- + str.encode(name, 'ascii') \
+ + name \
+ config['buf'] \
+ state['buf'] \
+ curr['buf'] \
@@ -2304,7 +2304,7 @@ class TestOFPTableStats(unittest.TestCase):
buf = table_id['buf'] \
+ zfill \
- + str.encode(name, 'ascii') \
+ + name \
+ wildcards['buf'] \
+ max_entries['buf'] \
+ active_count['buf'] \