From 326b46bf6d72e201fa8667f757ac5d2cef18885a Mon Sep 17 00:00:00 2001 From: IWASE Yusuke Date: Tue, 10 May 2016 14:29:38 +0900 Subject: topology: Adopt to Python 3 Signed-off-by: IWASE Yusuke Signed-off-by: FUJITA Tomonori --- ryu/topology/switches.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ryu/topology/switches.py b/ryu/topology/switches.py index d429effd..971d30bf 100644 --- a/ryu/topology/switches.py +++ b/ryu/topology/switches.py @@ -87,7 +87,7 @@ class Port(object): return {'dpid': dpid_to_str(self.dpid), 'port_no': port_no_to_str(self.port_no), 'hw_addr': self.hw_addr, - 'name': self.name.rstrip('\0')} + 'name': self.name.decode('utf-8')} # for Switch.del_port() def __eq__(self, other): @@ -476,7 +476,7 @@ class LLDPPacket(object): if tlv_chassis_id.subtype != lldp.ChassisID.SUB_LOCALLY_ASSIGNED: raise LLDPPacket.LLDPUnknownFormat( msg='unknown chassis id subtype %d' % tlv_chassis_id.subtype) - chassis_id = tlv_chassis_id.chassis_id + chassis_id = tlv_chassis_id.chassis_id.decode('utf-8') if not chassis_id.startswith(LLDPPacket.CHASSIS_ID_PREFIX): raise LLDPPacket.LLDPUnknownFormat( msg='unknown chassis id format %s' % chassis_id) -- cgit v1.2.3