Merge branch 'release/0.2.4'

.gitignore

@@ -1,2 +1,5 @@
 .idea
-MANIFEST
+MANIFEST
+coverage.xml
+nosetests.xml
+pylint.txt

AUTHORS

@@ -10,4 +10,5 @@ Development Lead
 Patches and Suggestions
 ```````````````````````
 
-- Various Pocoo Members
+- Various Pocoo Members
+- Chris Adams

HISTORY.rst

@@ -1,6 +1,24 @@
 History
 -------
 
+0.2.4 (2011-02-15)
+++++++++++++++++++
+
+* Python 2.5 Support
+* PyPy-c v1.4 Support
+* Auto-Authentication tests
+* Improved Request object constructor
+
+0.2.3 (2011-02-15)
+++++++++++++++++++
+
+* New HTTPHandling Methods
+    - Reponse.__nonzero__ (false if bad HTTP Status)
+    - Response.ok (True if expected HTTP Status)
+    - Response.error (Logged HTTPError if bad HTTP Status)
+    - Reponse.raise_for_status() (Raises stored HTTPError)
+
+
 0.2.2 (2011-02-14)
 ++++++++++++++++++
 

README.rst

@@ -85,17 +85,26 @@ If CookieJar object is is passed in (cookies=...), the cookies will be sent with
 
 **Responses:**
     
-    Request.status_code:
+    Response.status_code:
          (Integer) Received HTTP Status Code Response
 
-    Request.headers:
+    Response.headers:
         (Dictionary) Received HTTP Response Headers
 
-    Request.content:
+    Response.content:
         (Bytes) Received Content
 
-    Request.url
+    Response.url
         (String) URL of response. Useful for detecting redirects. 
+        
+    Response.ok
+        (Bool) True if no errors occurred during the request, and the status_code is kosher.
+    
+    Response.error
+        (HTTPError) If an HTTPError occurred (e.g. status of 404), Otherwise this is None.
+    
+    Response.raise_for_status()
+        Raises HTTPError if a request is not kosher.
 
 
 **HTTP Authentication Registry:**
@@ -131,8 +140,10 @@ If you'd like to contribute, simply fork `the repository`_, commit your changes
 Roadmap
 -------
 
-- Sphinx Documentation
-- Exhaustive Unittests
+- Sphinx Documentation (http://code.kennethreitz.com/requests/)
+- Exhaustive unit tests
+- Get rid of Poster (gets really nasty in py3.x)
+- Python 3.x Support
 
 .. _`the repository`: http://github.com/kennethreitz/requests
 .. _AUTHORS: http://github.com/kennethreitz/requests/blob/master/AUTHORS

requests/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from . import packages
-from .core import *
+import packages
+from core import *
+
+from core import __version__

requests/core.py

@@ -10,31 +10,32 @@
     :license: ISC, see LICENSE for more details.
 """
 
+from __future__ import absolute_import
 import urllib
 import urllib2
 
+from urllib2 import HTTPError
 
 try:
-	import eventlet
-	eventlet.monkey_patch()
+    import eventlet
+    eventlet.monkey_patch()
 except ImportError:
-	pass
+    pass
 
 if not 'eventlet' in locals():
-	try:
-		from gevent import monkey
-		monkey.patch_all()
-	except ImportError:
-		pass
-
+    try:
+        from gevent import monkey
+        monkey.patch_all()
+    except ImportError:
+        pass
 
 from .packages.poster.encode import multipart_encode
 from .packages.poster.streaminghttp import register_openers
 
 
 __title__ = 'requests'
-__version__ = '0.2.2'
-__build__ = 0x000202
+__version__ = '0.2.4'
+__build__ = 0x000204
 __author__ = 'Kenneth Reitz'
 __license__ = 'ISC'
 __copyright__ = 'Copyright 2011 Kenneth Reitz'
@@ -43,101 +44,104 @@ __copyright__ = 'Copyright 2011 Kenneth Reitz'
 AUTOAUTHS = []
 
 
+
 class _Request(urllib2.Request):
-	"""Hidden wrapper around the urllib2.Request object. Allows for manual
+    """Hidden wrapper around the urllib2.Request object. Allows for manual
     setting of HTTP methods.
     """
-	
-	def __init__(self, url, data=None, headers={}, origin_req_host=None, unverifiable=False, method=None):
-		urllib2.Request.__init__( self, url, data, headers, origin_req_host, unverifiable)
-		self.method = method
+    
+    def __init__(self, url, data=None, headers={}, origin_req_host=None,
+                 unverifiable=False, method=None):
+        urllib2.Request.__init__(self, url, data, headers, origin_req_host, unverifiable)
+        self.method = method
 
-	def get_method(self):
-		if self.method:
-			return self.method
+    def get_method(self):
+        if self.method:
+            return self.method
 
-		return urllib2.Request.get_method(self)
+        return urllib2.Request.get_method(self)
 
 
 class Request(object):
-	"""The :class:`Request` object. It carries out all functionality of
+    """The :class:`Request` object. It carries out all functionality of
     Requests. Recommended interface is with the Requests functions.
     """
-	
-	_METHODS = ('GET', 'HEAD', 'PUT', 'POST', 'DELETE')
-	
-	def __init__(self):
-		self.url = None
-		self.headers = dict()
-		self.files = None
-		self.method = None
-		self.params = {}
-		self.data = {}
-		self.response = Response()
-		
-		self.auth = None
-		self.cookiejar = None
-		self.sent = False
-		
-		
-	def __repr__(self):
-		return '<Request [%s]>' % (self.method)
-	
-	
-	def __setattr__(self, name, value):
-		if (name == 'method') and (value):
-			if not value in self._METHODS:
-				raise InvalidMethod()
-		
-		object.__setattr__(self, name, value)
-	
-	
-	def _checks(self):
-		"""Deterministic checks for consistency."""
+    
+    _METHODS = ('GET', 'HEAD', 'PUT', 'POST', 'DELETE')
+    
+    def __init__(self, url=None, headers=dict(), files=None, method=None,
+                 params=dict(), data=dict(), auth=None, cookiejar=None):
+        self.url = url
+        self.headers = headers
+        self.files = files
+        self.method = method
+        self.params = params
+        self.data = data
+        self.response = Response()
+        
+        self.auth = auth
+        self.cookiejar = cookiejar
+        self.sent = False
+        
+        
+    def __repr__(self):
+        return '<Request [%s]>' % (self.method)
+    
+    
+    def __setattr__(self, name, value):
+        if (name == 'method') and (value):
+            if not value in self._METHODS:
+                raise InvalidMethod()
+        
+        object.__setattr__(self, name, value)
+    
+    
+    def _checks(self):
+        """Deterministic checks for consistency."""
 
-		if not self.url:
-			raise URLRequired
+        if not self.url:
+            raise URLRequired
 
-		
-	def _get_opener(self):
-		"""Creates appropriate opener object for urllib2."""
+        
+    def _get_opener(self):
+        """Creates appropriate opener object for urllib2."""
 
-		_handlers = []
+        _handlers = []
 
-		if self.auth or self.cookiejar:
+        if self.auth or self.cookiejar:
 
-			if self.auth:
+            if self.auth:
 
-				authr = urllib2.HTTPPasswordMgrWithDefaultRealm()
+                authr = urllib2.HTTPPasswordMgrWithDefaultRealm()
 
-				authr.add_password(None, self.url, self.auth.username, self.auth.password)
-				auth_handler = urllib2.HTTPBasicAuthHandler(authr)
+                authr.add_password(None, self.url, self.auth.username, self.auth.password)
+                auth_handler = urllib2.HTTPBasicAuthHandler(authr)
 
-				_handlers.append(auth_handler)
+                _handlers.append(auth_handler)
 
-			if self.cookiejar:
+            if self.cookiejar:
 
-				cookie_handler = urllib2.HTTPCookieProcessor(cookiejar)
-				_handlers.append(cookie_handler)
+                cookie_handler = urllib2.HTTPCookieProcessor(cookiejar)
+                _handlers.append(cookie_handler)
 
-			opener = urllib2.build_opener(*_handlers)
-			return opener.open
+            opener = urllib2.build_opener(*_handlers)
+            return opener.open
 
-		else:
-			return urllib2.urlopen
+        else:
+            return urllib2.urlopen
 
 
-	def _build_response(self, resp):
-		"""Build internal Response object from given response."""
-		
-		self.response.status_code = resp.code
-		self.response.headers = resp.info().dict
-		self.response.content = resp.read()
-		self.response.url = resp.url
+    def _build_response(self, resp):
+        """Build internal Response object from given response."""
+        
+        self.response.status_code = resp.code
+        self.response.headers = resp.info().dict
+        self.response.content = resp.read()
+        self.response.url = resp.url
 
-	
-	def send(self, anyway=False):
-		"""Sends the request. Returns True of successful, false if not.
+    
+    def send(self, anyway=False):
+        """Sends the request. Returns True of successful, false if not.
         If there was an HTTPError during transmission,
         self.response.status_code will contain the HTTPError code.
 
@@ -147,128 +151,136 @@ class Request(object):
         already been sent.
         """
 
-		self._checks()
+        self._checks()
 
-		success = False
+        success = False
 
 
-		if self.method in ('GET', 'HEAD', 'DELETE'):
-			if (not self.sent) or anyway:
+        if self.method in ('GET', 'HEAD', 'DELETE'):
+            if (not self.sent) or anyway:
 
-				# url encode GET params if it's a dict
-				if isinstance(self.params, dict):
-					params = urllib.urlencode(self.params)
-				else:
+                # url encode GET params if it's a dict
+                if isinstance(self.params, dict):
+                    params = urllib.urlencode(self.params)
+                else:
+                    params = self.params
 
-					params = self.params
+                req = _Request(("%s?%s" % (self.url, params)), method=self.method)
 
-				req = _Request(("%s?%s" % (self.url, params)), method=self.method)
+                if self.headers:
+                    req.headers = self.headers
 
-				if self.headers:
-					req.headers = self.headers
+                opener = self._get_opener()
 
-				opener = self._get_opener()
+                try:
+                    resp = opener(req)
+                    self._build_response(resp)
+                    self.response.ok = True
 
-				try:
-					resp = opener(req)
-					self._build_response(resp)
-					success = True
-
-				except urllib2.HTTPError as why:
-					self._build_response(why)
-					success = False
+                except urllib2.HTTPError, why:
+                    self._build_response(why)
+                    self.response.error = why
 
 
-		elif self.method == 'PUT':
-			if (not self.sent) or anyway:
+        elif self.method == 'PUT':
+            if (not self.sent) or anyway:
 
-				if self.files:
-					register_openers()
-					datagen, headers = multipart_encode(self.files)
-					req = _Request(self.url, data=datagen, headers=headers, method='PUT')
+                if self.files:
+                    register_openers()
+                    datagen, headers = multipart_encode(self.files)
+                    req = _Request(self.url, data=datagen, headers=headers, method='PUT')
 
-					if self.headers:
-						req.headers.update(self.headers)
+                    if self.headers:
+                        req.headers.update(self.headers)
 
-				else:
+                else:
 
-					req = _Request(self.url, method='PUT')
+                    req = _Request(self.url, method='PUT')
 
-					if self.headers:
-						req.headers = self.headers
+                    if self.headers:
+                        req.headers = self.headers
 
-					req.data = self.data
+                    req.data = self.data
 
-				try:
-					opener = self._get_opener()
-					resp =  opener(req)
+                try:
+                    opener = self._get_opener()
+                    resp =  opener(req)
 
-					self._build_response(resp)
-					success = True
+                    self._build_response(resp)
+                    self.response.ok = True
 
-				except urllib2.HTTPError as why:
-					self._build_response(why)
-					success = False
+                except urllib2.HTTPError, why:
+                    self._build_response(why)
+                    self.response.error = why
 
 
-		elif self.method == 'POST':
-			if (not self.sent) or anyway:
+        elif self.method == 'POST':
+            if (not self.sent) or anyway:
 
-				if self.files:
-					register_openers()
-					datagen, headers = multipart_encode(self.files)
-					req = _Request(self.url, data=datagen, headers=headers, method='POST')
+                if self.files:
+                    register_openers()
+                    datagen, headers = multipart_encode(self.files)
+                    req = _Request(self.url, data=datagen, headers=headers, method='POST')
 
-					if self.headers:
-						req.headers.update(self.headers)
-				
-				else:
-					req = _Request(self.url, method='POST')
-					req.headers = self.headers
+                    if self.headers:
+                        req.headers.update(self.headers)
+                
+                else:
+                    req = _Request(self.url, method='POST')
+                    req.headers = self.headers
 
-					# url encode form data if it's a dict
-					if isinstance(self.data, dict):
-						req.data = urllib.urlencode(self.data)
-					else:
-						req.data = self.data
+                    # url encode form data if it's a dict
+                    if isinstance(self.data, dict):
+                        req.data = urllib.urlencode(self.data)
+                    else:
+                        req.data = self.data
 
-				try:
+                try:
+                    opener = self._get_opener()
+                    resp =  opener(req)
 
-					opener = self._get_opener()
-					resp =  opener(req)
+                    self._build_response(resp)
+                    self.response.ok = True
 
-					self._build_response(resp)
-					success = True
-
-				except urllib2.HTTPError as why:
-					self._build_response(why)
-					success = False
-
-		
-		self.sent = True if success else False
-		
-		return success
-		
+                except urllib2.HTTPError, why:
+                    self._build_response(why)
+                    self.response.error = why
+        
+        self.sent = self.response.ok
+        
+        return self.sent
+        
 
 class Response(object):
-	"""The :class:`Request` object. All :class:`Request` objects contain a
+    """The :class:`Request` object. All :class:`Request` objects contain a
     :class:`Request.response <response>` attribute, which is an instance of
     this class.
     """
 
-	def __init__(self):
-		self.content = None
-		self.status_code = None
-		self.headers = dict()
-		self.url = None
-		
-	def __repr__(self):
-		return '<Response [%s]>' % (self.status_code)
+    def __init__(self):
+        self.content = None
+        self.status_code = None
+        self.headers = dict()
+        self.url = None
+        self.ok = False
+        self.error = None
+        
+    def __repr__(self):
+        return '<Response [%s]>' % (self.status_code)
+        
+    def __nonzero__(self):
+        """Returns true if status_code is 'OK'."""
+        return not self.error
+        
+    def raise_for_status(self):
+        """Raises stored HTTPError if one exists."""
+        if self.error:
+            raise self.error
 
 
-	
+    
 class AuthObject(object):
-	"""The :class:`AuthObject` is a simple HTTP Authentication token. When
+    """The :class:`AuthObject` is a simple HTTP Authentication token. When
     given to a Requests function, it enables Basic HTTP Authentication for that
     Request. You can also enable Authorization for domain realms with AutoAuth.
     See AutoAuth for more details.
@@ -276,15 +288,15 @@ class AuthObject(object):
     :param username: Username to authenticate with.
     :param password: Password for given username.
     """
-	
-	def __init__(self, username, password):
-		self.username = username
-		self.password = password
+    
+    def __init__(self, username, password):
+        self.username = username
+        self.password = password
 
 
 
 def get(url, params={}, headers={}, cookies=None, auth=None):
-	"""Sends a GET request. Returns :class:`Response` object.
+    """Sends a GET request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
     :param params: (optional) Dictionary of GET Parameters to send with the :class:`Request`.
@@ -292,23 +304,16 @@ def get(url, params={}, headers={}, cookies=None, auth=None):
     :param cookies: (optional) CookieJar object to send with the :class:`Request`.
     :param auth: (optional) AuthObject to enable Basic HTTP Auth.
     """
-	
-	r = Request()
-	
-	r.method = 'GET'
-	r.url = url
-	r.params = params
-	r.headers = headers
-	r.cookiejar = cookies
-	r.auth = _detect_auth(url, auth)
-	
-	r.send()
-	
-	return r.response
+    
+    r = Request(method='GET', url=url, params=params, headers=headers,
+                cookiejar=cookies, auth=_detect_auth(url, auth))
+    r.send()
+    
+    return r.response
 
 
 def head(url, params={}, headers={}, cookies=None, auth=None):
-	"""Sends a HEAD request. Returns :class:`Response` object.
+    """Sends a HEAD request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
     :param params: (optional) Dictionary of GET Parameters to send with the :class:`Request`.
@@ -316,24 +321,15 @@ def head(url, params={}, headers={}, cookies=None, auth=None):
     :param cookies: (optional) CookieJar object to send with the :class:`Request`.
     :param auth: (optional) AuthObject to enable Basic HTTP Auth.
     """
-	
-	r = Request()
-	
-	r.method = 'HEAD'
-	r.url = url
-	# return response object
-	r.params = params
-	r.headers = headers
-	r.cookiejar = cookies
-	r.auth = _detect_auth(url, auth)
-	
-	r.send()
-	
-	return r.response
+    r = Request(method='HEAD', url=url, params=params, headers=headers,
+                cookiejar=cookies, auth=_detect_auth(url, auth))
+    r.send()
+    
+    return r.response
 
 
 def post(url, data={}, headers={}, files=None, cookies=None, auth=None):
-	"""Sends a POST request. Returns :class:`Response` object.
+    """Sends a POST request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
     :param data: (optional) Dictionary of POST Data to send with the :class:`Request`.
@@ -342,27 +338,16 @@ def post(url, data={}, headers={}, files=None, cookies=None, auth=None):
     :param cookies: (optional) CookieJar object to send with the :class:`Request`.
     :param auth: (optional) AuthObject to enable Basic HTTP Auth.
     """
-	
-	r = Request()
-	
-	r.url = url
-	r.method = 'POST'
-	r.data = data
-	
-	if files:
-		r.files = files
-	
-	r.headers = headers
-	r.cookiejar = cookies
-	r.auth = _detect_auth(url, auth)
-	
-	r.send()
-	
-	return r.response
-	
-	
+    
+    r = Request(method='POST', url=url, data=data, headers=headers,
+                files=files, cookiejar=cookies, auth=_detect_auth(url, auth))
+    r.send()
+    
+    return r.response
+    
+    
 def put(url, data='', headers={}, files={}, cookies=None, auth=None):
-	"""Sends a PUT request. Returns :class:`Response` object.
+    """Sends a PUT request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
     :param data: (optional) Bytes of PUT Data to send with the :class:`Request`.
@@ -371,24 +356,16 @@ def put(url, data='', headers={}, files={}, cookies=None, auth=None):
     :param cookies: (optional) CookieJar object to send with the :class:`Request`.
     :param auth: (optional) AuthObject to enable Basic HTTP Auth.
     """
-	
-	r = Request()
 
-	r.url = url
-	r.method = 'PUT'
-	r.data = data
-	r.files = files
-	r.headers = headers
-	r.cookiejar = cookies
-	r.auth = _detect_auth(url, auth)
-	
-	r.send()
-	
-	return r.response
+    r = Request(method='PUT', url=url, data=data, headers=headers, files=files,
+                cookiejar=cookies, auth=_detect_auth(url, auth))
+    r.send()
+    
+    return r.response
 
-	
+    
 def delete(url, params={}, headers={}, cookies=None, auth=None):
-	"""Sends a DELETE request. Returns :class:`Response` object.
+    """Sends a DELETE request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
     :param params: (optional) Dictionary of GET Parameters to send with the :class:`Request`.
@@ -396,23 +373,16 @@ def delete(url, params={}, headers={}, cookies=None, auth=None):
     :param cookies: (optional) CookieJar object to send with the :class:`Request`.
     :param auth: (optional) AuthObject to enable Basic HTTP Auth.
     """
-	
-	r = Request()
-
-	r.url = url
-	r.method = 'DELETE'
-	
-	r.headers = headers
-	r.cookiejar = cookies
-	r.auth = _detect_auth(url, auth)
-	
-	r.send()
-	
-	return r.response
+    
+    r = Request(method='DELETE', url=url, params=params, headers=headers,
+                cookiejar=cookies, auth=_detect_auth(url, auth))
+    r.send()
+    
+    return r.response
 
 
 def add_autoauth(url, authobject):
-	"""Registers given AuthObject to given URL domain. for auto-activation.
+    """Registers given AuthObject to given URL domain. for auto-activation.
     Once a URL is registered with an AuthObject, the configured HTTP
     Authentication will be used for all requests with URLS containing the given
     URL string.
@@ -427,37 +397,38 @@ def add_autoauth(url, authobject):
     :param authobject: AuthObject to auto-activate.
     """
 
-	global AUTOAUTHS
-	
-	AUTOAUTHS.append((url, authobject))
+    global AUTOAUTHS
+    
+    AUTOAUTHS.append((url, authobject))
 
 
 def _detect_auth(url, auth):
-	"""Returns registered AuthObject for given url if available, defaulting to
+    """Returns registered AuthObject for given url if available, defaulting to
     given AuthObject.
     """
 
-	return _get_autoauth(url) if not auth else auth
+    return _get_autoauth(url) if not auth else auth
 
-	
+    
 def _get_autoauth(url):
-	"""Returns registered AuthObject for given url if available."""
-	
-	for (autoauth_url, auth) in AUTOAUTHS:
-		if autoauth_url in url: 
-			return auth
-			
-	return None
+    """Returns registered AuthObject for given url if available."""
+    
+    for (autoauth_url, auth) in AUTOAUTHS:
+        if autoauth_url in url: 
+            return auth
+            
+    return None
 
 
 class RequestException(Exception):
-	"""There was an ambiguous exception that occured while handling your request."""
+    """There was an ambiguous exception that occured while handling your
+    request."""
 
 class AuthenticationError(RequestException):
-	"""The authentication credentials provided were invalid."""
-	
+    """The authentication credentials provided were invalid."""
+    
 class URLRequired(RequestException):
-	"""A valid URL is required to make a request."""
-	
+    """A valid URL is required to make a request."""
+    
 class InvalidMethod(RequestException):
-	"""An inappropriate method was attempted."""
+    """An inappropriate method was attempted."""

requests/packages/__init__.py

@@ -1 +1,3 @@
+from __future__ import absolute_import
+
 from . import poster

requests/packages/poster/__init__.py

@@ -26,6 +26,8 @@ New releases of poster will always have a version number that compares greater
 than an older version of poster.
 New in version 0.6."""
 
+from __future__ import absolute_import
+
 from . import streaminghttp
 from . import encode
 

setup.py

@@ -3,49 +3,50 @@
 
 import os
 import sys
+import requests
 
 from distutils.core import setup
 
 
-	
+    
 if sys.argv[-1] == "publish":
-	os.system("python setup.py sdist upload")
-	sys.exit()
+    os.system("python setup.py sdist upload")
+    sys.exit()
 
 if sys.argv[-1] == "test":
-	os.system("python test_requests.py")
-	sys.exit()
-	
+    os.system("python test_requests.py")
+    sys.exit()
+    
 required = []
 
 # if python > 2.6, require simplejson
 
 setup(
-	name='requests',
-	version='0.2.2',
-	description='Awesome Python HTTP Library that\'s actually usable.',
-	long_description=open('README.rst').read() + '\n\n' +
-	                 open('HISTORY.rst').read(),
-	author='Kenneth Reitz',
-	author_email='me@kennethreitz.com',
-	url='https://github.com/kennethreitz/requests',
-	packages= [
-		'requests',
-		'requests.packages',
-		'requests.packages.poster'
-	],
-	install_requires=required,
-	license='ISC',
-	classifiers=(
-		# 'Development Status :: 5 - Production/Stable',
-		'Intended Audience :: Developers',
-		'Natural Language :: English',
-		'License :: OSI Approved :: ISC License (ISCL)',
-		'Programming Language :: Python',
-        # 'Programming Language :: Python :: 2.5',
+    name='requests',
+    version=requests.__version__,
+    description='Awesome Python HTTP Library that\'s actually usable.',
+    long_description=open('README.rst').read() + '\n\n' +
+                     open('HISTORY.rst').read(),
+    author='Kenneth Reitz',
+    author_email='me@kennethreitz.com',
+    url='https://github.com/kennethreitz/requests',
+    packages= [
+        'requests',
+        'requests.packages',
+        'requests.packages.poster'
+    ],
+    install_requires=required,
+    license='ISC',
+    classifiers=(
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'License :: OSI Approved :: ISC License (ISCL)',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
-		'Programming Language :: Python :: 2.7',
-		# 'Programming Language :: Python :: 3.0',
-		# 'Programming Language :: Python :: 3.1',
-	),
+        'Programming Language :: Python :: 2.7',
+        # 'Programming Language :: Python :: 3.0',
+        # 'Programming Language :: Python :: 3.1',
+    ),
 )

test_requests.py

@@ -1,61 +1,96 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-
 import unittest
-from cStringIO import StringIO
 
 import requests
 
 
 class RequestsTestSuite(unittest.TestCase):
-	"""Requests test cases."""
-	
-	def setUp(self):
-		pass
+    """Requests test cases."""
+    
+    def setUp(self):
+        pass
 
-	def tearDown(self):
-		"""Teardown."""
-		pass
-		
-	def test_invalid_url(self):
-		self.assertRaises(ValueError, requests.get, 'hiwpefhipowhefopw')
+    def tearDown(self):
+        """Teardown."""
+        pass
+        
+    def test_invalid_url(self):
+        self.assertRaises(ValueError, requests.get, 'hiwpefhipowhefopw')
 
-	def test_HTTP_200_OK_GET(self):
-		r = requests.get('http://google.com')
-		self.assertEqual(r.status_code, 200)
 
-	def test_HTTPS_200_OK_GET(self):
-		r = requests.get('https://google.com')
-		self.assertEqual(r.status_code, 200)
+    def test_HTTP_200_OK_GET(self):
+        r = requests.get('http://google.com')
+        self.assertEqual(r.status_code, 200)
 
-	def test_HTTP_200_OK_HEAD(self):
-		r = requests.head('http://google.com')
-		self.assertEqual(r.status_code, 200)
 
-	def test_HTTPS_200_OK_HEAD(self):
-		r = requests.head('https://google.com')
-		self.assertEqual(r.status_code, 200)
+    def test_HTTPS_200_OK_GET(self):
+        r = requests.get('https://google.com')
+        self.assertEqual(r.status_code, 200)
 
-	def test_AUTH_HTTPS_200_OK_GET(self):
-		auth = requests.AuthObject('requeststest', 'requeststest')
-		url = 'https://convore.com/api/account/verify.json'
-		r = requests.get(url, auth=auth)
 
-		self.assertEqual(r.status_code, 200)
+    def test_HTTP_200_OK_HEAD(self):
+        r = requests.head('http://google.com')
+        self.assertEqual(r.status_code, 200)
 
-	def test_POSTBIN_GET_POST_FILES(self):
 
-		bin = requests.post('http://www.postbin.org/')
-		self.assertEqual(bin.status_code, 200)
+    def test_HTTPS_200_OK_HEAD(self):
+        r = requests.head('https://google.com')
+        self.assertEqual(r.status_code, 200)
 
-		post = requests.post(bin.url, data={'some': 'data'})
-		self.assertEqual(post.status_code, 201)
 
-		post2 = requests.post(bin.url, files={'some': StringIO('data')})
-		self.assertEqual(post2.status_code, 201)
+    def test_AUTH_HTTPS_200_OK_GET(self):
+        auth = requests.AuthObject('requeststest', 'requeststest')
+        url = 'https://convore.com/api/account/verify.json'
+        r = requests.get(url, auth=auth)
 
+        self.assertEqual(r.status_code, 200)
+
+
+        requests.add_autoauth(url, auth)
+
+        r = requests.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        # reset auto authentication
+        requests.AUTOAUTHS = []
+
+
+
+    def test_POSTBIN_GET_POST_FILES(self):
+
+        bin = requests.post('http://www.postbin.org/')
+        self.assertEqual(bin.status_code, 200)
+
+        post = requests.post(bin.url, data={'some': 'data'})
+        self.assertEqual(post.status_code, 201)
+
+        post2 = requests.post(bin.url, files={'some': open('test_requests.py')})
+        self.assertEqual(post2.status_code, 201)
+
+
+    def test_nonzero_evaluation(self):
+        r = requests.get('http://google.com/some-404-url')
+        self.assertEqual(bool(r), False)
+    
+        r = requests.get('http://google.com/')
+        self.assertEqual(bool(r), True)
+
+
+    def test_request_ok_set(self):
+        r = requests.get('http://google.com/some-404-url')
+        self.assertEqual(r.ok, False)
+
+
+    def test_status_raising(self):
+        r = requests.get('http://google.com/some-404-url')
+        self.assertRaises(requests.HTTPError, r.raise_for_status)
+
+        r = requests.get('http://google.com/')
+        self.assertFalse(r.error)
+        r.raise_for_status()
 
 
 if __name__ == '__main__':
-	unittest.main()
+    unittest.main()

tox.ini

@@ -0,0 +1,11 @@
+[tox]
+envlist = py25,py26,py27,pypy
+
+[testenv]
+commands=py.test --junitxml=junit-{envname}.xml
+deps = 
+    pytest
+
+[testenv:pypy]
+basepython=/usr/bin/pypy-c
+