Skip to content

Commit

Permalink
Merge pull request #1353 from abn/fix-unhandled-exception
Browse files Browse the repository at this point in the history
Simplify request ip and port retrieval logic
  • Loading branch information
yunstanford committed Oct 10, 2018
2 parents ed1f3da + c3b31a6 commit 8ce5196
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions sanic/request.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import sys
import json
import socket
from cgi import parse_header
from collections import namedtuple
from http.cookies import SimpleCookie
Expand Down Expand Up @@ -192,18 +191,10 @@ def socket(self):
return self._socket

def _get_address(self):
sock = self.transport.get_extra_info('socket')

if sock.family == socket.AF_INET:
self._socket = (self.transport.get_extra_info('peername') or
(None, None))
self._ip, self._port = self._socket
elif sock.family == socket.AF_INET6:
self._socket = (self.transport.get_extra_info('peername') or
(None, None, None, None))
self._ip, self._port, *_ = self._socket
else:
self._ip, self._port = (None, None)
self._socket = self.transport.get_extra_info('peername') or \
(None, None)
self._ip = self._socket[0]
self._port = self._socket[1]

@property
def remote_addr(self):
Expand Down

0 comments on commit 8ce5196

Please sign in to comment.