django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2025-07-30 00:49:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Python 2 fix for host address

Browse Source 
This is a copy of
57051a48cd
for the Websocket protocol.

In Python 2, Twisted returns a byte string for the host address, while
the spec requires a unicode string. A simple cast gives us consistency.
This commit is contained in:
Maik Hoepfel 2017-04-28 11:04:42 +02:00
parent bd03fabce6
commit 66cbc50124
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daphne/ws_protocol.py
View File

@ -50,9 +50,11 @@ class WebSocketProtocol(WebSocketServerProtocol):
# Tell main factory about it # Tell main factory about it
self.main_factory.reply_protocols[self.reply_channel] = self self.main_factory.reply_protocols[self.reply_channel] = self
# Get client address if possible # Get client address if possible
if hasattr(self.transport.getPeer(), "host") and hasattr(self.transport.getPeer(), "port"): peer = self.transport.getPeer()
self.client_addr = [self.transport.getPeer().host, self.transport.getPeer().port] host = self.transport.getHost()
self.server_addr = [self.transport.getHost().host, self.transport.getHost().port] if hasattr(peer, "host") and hasattr(peer, "port"):
self.client_addr = [six.text_type(peer.host), peer.port]
self.server_addr = [six.text_type(host.host), host.port]
else: else:
self.client_addr = None self.client_addr = None
self.server_addr = None self.server_addr = None