Merge commit '636b946af5eac8ba4cffa63a727523cd8c2c01ab' into v3.0.0

3.0-HISTORY.rst

@@ -0,0 +1,11 @@
+3.0.0 (2015-xx-xx)
+++++++++++++++++++
+
+- Remove the ``__bool__`` and ``__nonzero__`` methods from a ``Response``
+  object.
+
+  This has been a planned feature for over a year. The behaviour is surprising
+  to most people and breaks most of the assumptions that people have about
+  Response objects. This resolves issue `#2002`_
+
+.. _#2002: https://github.com/kennethreitz/requests/issues/2002

requests/models.py

@@ -605,14 +605,6 @@ class Response(object):
     def __repr__(self):
         return '<Response [%s]>' % (self.status_code)
 
-    def __bool__(self):
-        """Returns true if :attr:`status_code` is 'OK'."""
-        return self.ok
-
-    def __nonzero__(self):
-        """Returns true if :attr:`status_code` is 'OK'."""
-        return self.ok
-
     def __iter__(self):
         """Allows you to use a response as an iterator."""
         return self.iter_content(128)