open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

u"" cleanup on rendezvous_websocket.py

Browse Source
This commit is contained in:
laharah 2016-06-04 13:12:00 -07:00
parent 8537d90527
commit 57d117e4f0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wormhole/server/rendezvous_websocket.py
View File

@ -164,7 +164,7 @@ class WebSocketRendezvous(websocket.WebSocketServerProtocol):
if self._did_allocate: if self._did_allocate:
raise Error("you already allocated one, don't be greedy") raise Error("you already allocated one, don't be greedy")
nameplate_id = self._app.allocate_nameplate(self._side, server_rx) nameplate_id = self._app.allocate_nameplate(self._side, server_rx)
assert isinstance(nameplate_id, type(u"")) assert isinstance(nameplate_id, type(""))
self._did_allocate = True self._did_allocate = True
self.send("allocated", nameplate=nameplate_id) self.send("allocated", nameplate=nameplate_id)
@ -172,7 +172,7 @@ class WebSocketRendezvous(websocket.WebSocketServerProtocol):
if "nameplate" not in msg: if "nameplate" not in msg:
raise Error("claim requires 'nameplate'") raise Error("claim requires 'nameplate'")
nameplate_id = msg["nameplate"] nameplate_id = msg["nameplate"]
assert isinstance(nameplate_id, type(u"")), type(nameplate_id) assert isinstance(nameplate_id, type("")), type(nameplate_id)
self._nameplate_id = nameplate_id self._nameplate_id = nameplate_id
try: try:
mailbox_id = self._app.claim_nameplate(nameplate_id, self._side, mailbox_id = self._app.claim_nameplate(nameplate_id, self._side,
@ -195,7 +195,7 @@ class WebSocketRendezvous(websocket.WebSocketServerProtocol):
if "mailbox" not in msg: if "mailbox" not in msg:
raise Error("open requires 'mailbox'") raise Error("open requires 'mailbox'")
mailbox_id = msg["mailbox"] mailbox_id = msg["mailbox"]
assert isinstance(mailbox_id, type(u"")) assert isinstance(mailbox_id, type(""))
self._mailbox = self._app.open_mailbox(mailbox_id, self._side, self._mailbox = self._app.open_mailbox(mailbox_id, self._side,
server_rx) server_rx)
def _send(sm): def _send(sm):