adapt the Request.source property to python 3

liberapay · Jan 26, 2019 · a51b9c0 · a51b9c0
1 parent 7f79c6a
commit a51b9c0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/liberapay/main.py b/liberapay/main.py
@@ -235,7 +235,8 @@ def _Querystring_derive(self, **kw):
     raise Warning('pando.http.request.Request.source already exists')
 def _source(self):
     def f():
-        addr = ip_address(self.environ[b'REMOTE_ADDR'].decode('ascii'))
+        addr = self.environ.get('REMOTE_ADDR') or self.environ[b'REMOTE_ADDR']
+        addr = ip_address(addr.decode('ascii') if type(addr) is bytes else addr)
         trusted_proxies = getattr(self.website, 'trusted_proxies', None)
         forwarded_for = self.headers.get(b'X-Forwarded-For')
         self.__dict__['bypasses_proxy'] = bool(trusted_proxies)