diff options
| author | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2016-06-08 11:05:32 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-06-09 13:27:06 +0900 |
| commit | f86499373a44972c77aa8ccc7b5f10f2fab024e1 (patch) | |
| tree | 3889c229aabc304de0c1d7994b3f35e93f451848 | |
| parent | 55a88d6805e5b62bae96aaa710459150c77340c5 (diff) | |
Python3: Explicit string type encoding
Reviewed-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/controller/controller.py | 2 | ||||
| -rw-r--r-- | ryu/services/protocols/bgp/speaker.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ryu/controller/controller.py b/ryu/controller/controller.py index 4aea6bdb..54fb1c95 100644 --- a/ryu/controller/controller.py +++ b/ryu/controller/controller.py @@ -233,8 +233,6 @@ class Datapath(ofproto_protocol.ProtocolDesc): count = 0 while self.state != DEAD_DISPATCHER: - ret = "" - try: ret = self.socket.recv(required_len) except SocketTimeout: diff --git a/ryu/services/protocols/bgp/speaker.py b/ryu/services/protocols/bgp/speaker.py index fd6af442..31553b27 100644 --- a/ryu/services/protocols/bgp/speaker.py +++ b/ryu/services/protocols/bgp/speaker.py @@ -101,7 +101,7 @@ class BgpProtocol(Protocol, Activity): Activity.__init__(self, name=activity_name) # Intialize instance variables. self._peer = None - self._recv_buff = '' + self._recv_buff = b'' self._socket = socket self._socket.setsockopt(IPPROTO_TCP, TCP_NODELAY, 1) self._sendlock = semaphore.Semaphore() |