path fixes

Author: Kenneth Reitz

Makefile

@@ -8,7 +8,7 @@ test:
 	nosetests --with-color ./tests/*
 
 lazy:
-	nosetests --with-color test_requests.py
+	nosetests --with-color tests/test_requests.py
 
 server:
 	gunicorn httpbin:app --bind=0.0.0.0:7077 &

requests/models.py

@@ -191,7 +191,10 @@ def build(resp):
 
             # Save original response for later.
             response.raw = resp
-            response.url = self.full_url.decode('utf-8')
+            if isinstance(self.full_url, bytes):
+                response.url = self.full_url.decode('utf-8')
+            else:
+                response.url = self.full_url
 
             return response
 
@@ -737,7 +740,8 @@ def content(self):
                     raise RuntimeError(
                         'The content for this response was already consumed')
 
-                self._content = bytes('').join(self.iter_content()) or None
+                self._content = bytes().join(self.iter_content()) or None
+                # print repr(self._content)
             except AttributeError:
                 self._content = None