Merge branch 'develop' into feature/rewrite

Conflicts:
	requests/__init__.py
	test_requests.py

AUTHORS

@@ -47,4 +47,6 @@ Patches and Suggestions
 - Travis N. Vaught
 - Fredrik Möllerstrand
 - Daniel Hengeveld
-- Dan Head
+- Dan Head
+- Bruno Renié
+- David Fischer

HISTORY.rst

@@ -1,6 +1,17 @@
 History
 -------
 
+0.7.6 (2011-11-07)
+++++++++++++++++++
+
+* Digest authentication bugfix (attach query data to path)
+
+0.7.5 (2011-11-04)
+++++++++++++++++++
+
+* Response.content = None if there was an invalid repsonse.
+* Redirection auth handling.
+
 0.7.4 (2011-10-26)
 ++++++++++++++++++
 

README.rst

@@ -93,8 +93,10 @@ But, you really shouldn't do that.
 Contribute
 ----------
 
-If you'd like to contribute, simply fork `the repository`_, commit your changes to the **develop** branch (or branch off of it), and send a pull request. Make sure you add yourself to AUTHORS_.
-
+#. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug. There is a Contributor Friendly tag for issues that should be ideal for people who are not very familiar with the codebase yet.
+#. Fork `the repository`_ on Github to start making your changes to the **develop** branch (or branch off of it).
+#. Write a test which shows that the bug was fixed or that the feature works as expected.
+#. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
 
 .. _`the repository`: http://github.com/kennethreitz/requests
 .. _AUTHORS: http://github.com/kennethreitz/requests/blob/master/AUTHORS

docs/_themes/kr/layout.html

@@ -2,18 +2,19 @@
 {%- block extrahead %}
   {{ super() }}
   {% if theme_touch_icon %}
-  <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" />
+    <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" />
   {% endif %}
   <link media="only screen and (max-device-width: 480px)" href="{{
     pathto('_static/small_flask.css', 1) }}" type= "text/css" rel="stylesheet" />
+  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9">
 {% endblock %}
 {%- block relbar2 %}{% endblock %}
 {%- block footer %}
     <div class="footer">
       &copy; Copyright {{ copyright }}.
     </div>
-    <a href="https://github.com/kennethreitz/requests">
-        <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" />
+    <a href="https://github.com/kennethreitz/requests" class="github">
+        <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"  class="github"/>
     </a>
     <script type="text/javascript">
 

docs/_themes/kr/static/flasky.css_t

@@ -393,6 +393,11 @@ a:hover tt {
     	display: none;
     }
 
+    div.document {
+       width: 100%;
+
+    }
+
     div.documentwrapper {
     	margin-left: 0;
     	margin-top: 0;
@@ -415,6 +420,10 @@ a:hover tt {
     	width: auto;
     }
 
+    .footer {
+    	width: auto;
+    }
+
     .bodywrapper {
     	margin: 0;
     }
@@ -423,7 +432,9 @@ a:hover tt {
     	width: auto;
     }
 
-
+    .github {
+        display: none;
+    }
 
 }
 

docs/_themes/kr/static/small_flask.css

@@ -68,3 +68,23 @@ div.body {
     min-height: 0;
     padding: 0;
 }
+
+.rtd_doc_footer {
+    display: none;
+}
+
+.document {
+    width: auto;
+}
+
+.footer {
+	width: auto;
+}
+
+.footer {
+	width: auto;
+}
+
+.github {
+    display: none;
+}

docs/community/out-there.rst

@@ -7,6 +7,8 @@ Modules
 - `fullerene <https://github.com/bitprophet/fullerene>`_, a Graphite Dashboard.
 - `urbanairship-python <https://github.com/benjaminws/urbanairship-python>`_, a fork of the Urban Airship API wrapper.
 - `WhitespaceBot <https://github.com/Gunio/WhitespaceBot/>`_, a project that automatically forks repos, strips trailing whitespace, and sends a pull request.
+- `python-rexster <https://github.com/CulturePlex/python-rexster>`_, Rexter client that provides a simple interface for graph databases.
+- `daikon <https://github.com/neogenix/daikon>`_, a CLI for ElasticSearch.
 
 Articles & Talks
 ================
@@ -16,6 +18,7 @@ Articles & Talks
 - `Issac Kelly's 'Consuming Web APIs' talk <http://issackelly.github.com/Consuming-Web-APIs-with-Python-Talk/slides/slides.html>`_
 - `Blog post about Requests via Yum <http://arunsag.wordpress.com/2011/08/17/new-package-python-requests-http-for-humans/>`_
 - `Russian blog post introducing Requests <http://habrahabr.ru/blogs/python/126262/>`_
+- `French blog post introducing Requests <http://www.nicosphere.net/requests-urllib2-de-python-simplifie-2432/>`_
 
 
 Integrations

docs/index.rst

@@ -39,7 +39,7 @@ all the hard work and crazy hacks for you.
 Testimonials
 ------------
 
-`Twitter, Inc <http://twitter.com>`_,
+`The Washington Post <http://www.washingtonpost.com/>`_, `Twitter, Inc <http://twitter.com>`_,
 a U.S. Federal Institution,
 NIH, 
 `Readability <http://readability.com>`_, and

docs/user/quickstart.rst

@@ -164,4 +164,4 @@ Requests supports it!::
 
 -----------------------
 
-Ready for more? Check out the advanced_ section.
+Ready for more? Check out the :ref:`advanced <advanced>` section.

requests/api.py

@@ -29,6 +29,23 @@ def request(method, url,
     hooks=None,
     return_response=True,
     config=None):
+    """Constructs and sends a :class:`Request <Request>`.
+    Returns :class:`Response <Response>` object.
+
+    :param method: method for the new :class:`Request` object.
+    :param url: URL for the new :class:`Request` object.
+    :param params: (optional) Dictionary or bytes to be sent in the query string for the :class:`Request`.
+    :param data: (optional) Dictionary or bytes to send in the body of the :class:`Request`.
+    :param headers: (optional) Dictionary of HTTP Headers to send with the :class:`Request`.
+    :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
+    :param files: (optional) Dictionary of 'filename': file-like-objects for multipart encoding upload.
+    :param auth: (optional) Auth typle to enable Basic/Digest/Custom HTTP Auth.
+    :param timeout: (optional) Float describing the timeout of the request.
+    :param allow_redirects: (optional) Boolean. Set to True if POST/PUT/DELETE redirect following is allowed.
+    :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy.
+    :param return_response: (optional) If False, an un-sent Request object will returned.
+    :param config: (optional) A configuration dictionary.
+    """
 
     s = session()
     return s.request(

requests/auth.py

@@ -67,7 +67,8 @@ def http_digest(r, username, password):
 
             # XXX not implemented yet
             entdig = None
-            path = urlparse(r.request.url).path
+            p_parsed = urlparse(r.request.url)
+            path = p_parsed.path + p_parsed.query
 
             A1 = "%s:%s:%s" % (username, realm, password)
             A2 = "%s:%s" % (r.request.method, path)

requests/models.py

@@ -93,6 +93,7 @@ class Request(object):
         self.response = Response()
 
         #: Authentication tuple to attach to :class:`Request <Request>`.
+        self._auth = auth
         self.auth = auth_dispatch(auth)
 
         #: CookieJar to attach to :class:`Request <Request>`.
@@ -250,7 +251,7 @@ class Request(object):
                     method=method,
                     # data=self.data,
                     # params=self.params,
-                    auth=self.auth,
+                    auth=self._auth,
                     cookies=self.cookies,
                     redirect=True,
                     config=self.config,
@@ -532,7 +533,11 @@ class Response(object):
                                'already consumed')
 
         # Read the contents.
-        self._content = self.raw.read()
+        try:
+            self._content = self.raw.read()
+        except AttributeError:
+            return None
+
 
         # Decode GZip'd content.
         if 'gzip' in self.headers.get('content-encoding', ''):

test_requests.py

@@ -548,6 +548,15 @@ class RequestsTestSuite(unittest.TestCase):
         print r.content
         print r.url
 
+    def test_invalid_content(self):
+
+        # WARNING: if you're using a terrible DNS provider (comcast),
+        # this will fail.
+        r = requests.get('http://somedomainthatclearlydoesntexistg.com', allow_redirects=False)
+
+        assert r.content == None
+
+
 
 if __name__ == '__main__':
     unittest.main()