Permalink
Browse files

Merge branch 'release/0.2.4'

  • Loading branch information...
2 parents 952970f + 720d0b2 commit d2cdefa7df40e8b9cb98e831dc70bcefa71467c5 @kennethreitz kennethreitz committed Feb 19, 2011
Showing with 42 additions and 20 deletions.
  1. +8 −0 HISTORY.rst
  2. +4 −2 README.rst
  3. +4 −2 requests/__init__.py
  4. +5 −5 requests/core.py
  5. +4 −3 setup.py
  6. +11 −2 test_requests.py
  7. +0 −4 test_suite.sh
  8. +6 −2 tox.ini
View
@@ -1,6 +1,14 @@
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)
++++++++++++++++++
View
@@ -140,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
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
-from . import packages
-from .core import *
+import packages
+from core import *
+
+from core import __version__
View
@@ -34,8 +34,8 @@
__title__ = 'requests'
-__version__ = '0.2.3'
-__build__ = 0x000203
+__version__ = '0.2.4'
+__build__ = 0x000204
__author__ = 'Kenneth Reitz'
__license__ = 'ISC'
__copyright__ = 'Copyright 2011 Kenneth Reitz'
@@ -177,7 +177,7 @@ def send(self, anyway=False):
self._build_response(resp)
self.response.ok = True
- except urllib2.HTTPError as why:
+ except urllib2.HTTPError, why:
self._build_response(why)
self.response.error = why
@@ -209,7 +209,7 @@ def send(self, anyway=False):
self._build_response(resp)
self.response.ok = True
- except urllib2.HTTPError as why:
+ except urllib2.HTTPError, why:
self._build_response(why)
self.response.error = why
@@ -242,7 +242,7 @@ def send(self, anyway=False):
self._build_response(resp)
self.response.ok = True
- except urllib2.HTTPError as why:
+ except urllib2.HTTPError, why:
self._build_response(why)
self.response.error = why
View
@@ -3,6 +3,7 @@
import os
import sys
+import requests
from distutils.core import setup
@@ -22,7 +23,7 @@
setup(
name='requests',
- version='0.2.3',
+ version=requests.__version__,
description='Awesome Python HTTP Library that\'s actually usable.',
long_description=open('README.rst').read() + '\n\n' +
open('HISTORY.rst').read(),
@@ -37,12 +38,12 @@
install_requires=required,
license='ISC',
classifiers=(
- # 'Development Status :: 5 - Production/Stable',
+ '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.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
# 'Programming Language :: Python :: 3.0',
View
@@ -2,7 +2,6 @@
# -*- coding: utf-8 -*-
import unittest
-from cStringIO import StringIO
import requests
@@ -49,6 +48,16 @@ def test_AUTH_HTTPS_200_OK_GET(self):
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/')
@@ -57,7 +66,7 @@ def test_POSTBIN_GET_POST_FILES(self):
post = requests.post(bin.url, data={'some': 'data'})
self.assertEqual(post.status_code, 201)
- post2 = requests.post(bin.url, files={'some': StringIO('data')})
+ post2 = requests.post(bin.url, files={'some': open('test_requests.py')})
self.assertEqual(post2.status_code, 201)
View
@@ -1,4 +0,0 @@
-tox
-coverage xml
-rm -fr pylint.txt
-pylint -d W0312 -d W0212 -d E1101 -d E0202 -d W0102 -d E0102 -f parseable ./requests > pylint.txt || true
View
@@ -1,7 +1,11 @@
[tox]
-envlist = py24,py25,py26,py27
+envlist = py25,py26,py27,pypy
[testenv]
commands=py.test --junitxml=junit-{envname}.xml
deps =
- pytest
+ pytest
+
+[testenv:pypy]
+basepython=/usr/bin/pypy-c
+

0 comments on commit d2cdefa

Please sign in to comment.