move config around a bit

diff --git a/.env b/.env
new file mode 100644 (file)
index 0000000..04f2d7f
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+workon r

diff --git a/requests/models.py b/requests/models.py
index 8368c9fb4235e56e03392afd356a4e0942b8cec7..d580e7d616304ed2a3b503ba838bfc4a626af809 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -65,6 +65,9 @@ class Request(object):
         verify=None,
         session=None):
 
+        #: Dictionary of configurations for this request.
+        self.config = dict(config or [])
+
         #: Float describes the timeout of the request.
         #  (Use socket.setdefaulttimeout() as fallback)
         self.timeout = timeout
@@ -112,9 +115,6 @@ class Request(object):
         #: CookieJar to attach to :class:`Request <Request>`.
         self.cookies = dict(cookies or [])
 
-        #: Dictionary of configurations for this request.
-        self.config = dict(config or [])
-
         #: True if Request has been sent.
         self.sent = False
 
@@ -320,6 +320,7 @@ class Request(object):
         if not path:
             path = '/'
 
+
         if is_py2:
             if isinstance(scheme, str):
                 scheme = scheme.encode('utf-8')

diff --git a/test.py b/test.py
new file mode 100644 (file)
index 0000000..f7506d4
--- /dev/null
+++ b/test.py
@@ -0,0 +1,7 @@
+import requests
+
+s = requests.session()
+s.config['encode_urls'] = False
+
+r = s.get('http://localhost:7077/get?me=\"')
+print r.text

diff --git a/tests/test_requests_ext.py b/tests/test_requests_ext.py
index 4d40fa3c92227cbbbc037e6cbb3baa0aa626ca3a..1e25dbe6f4a350e63d10082ceee78c2ef8405747 100644 (file)
--- a/tests/test_requests_ext.py
+++ b/tests/test_requests_ext.py
@@ -49,6 +49,10 @@ class RequestsTestSuite(unittest.TestCase):
         requests.post('http://www.google.com/', data=utf8_string)
 
 
+    def test_unicode_error(self):
+        url = u'http://blip.fm/~1abvfu'
+        requests.get(url)
+
 if __name__ == '__main__':
     unittest.main()