From: Kenneth Reitz Date: Thu, 12 May 2011 08:02:06 +0000 (-0400) Subject: version bump X-Git-Tag: v0.3.3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01b22a7e127d1b9c90d02a7101267b12ef1ed2ec;p=services%2Fpython-requests.git version bump --- diff --git a/HISTORY.rst b/HISTORY.rst index 2fbb8e1..0eaf42a 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,7 +1,7 @@ History ------- -0.3.3 (2011-04-??) +0.3.3 (2011-05-12) ++++++++++++++++++ * Request timeouts diff --git a/docs/conf.py b/docs/conf.py index f8865c7..5da948b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,7 +48,7 @@ copyright = u'2011, Kenneth Reitz' # built documents. # # The short X.Y version. -version = '0.3.2' +version = '0.3.3' # The full version, including alpha/beta/rc tags. release = version diff --git a/requests/core.py b/requests/core.py index 733dbbc..bb62fce 100644 --- a/requests/core.py +++ b/requests/core.py @@ -26,8 +26,8 @@ from .packages.poster.streaminghttp import register_openers, get_handlers __title__ = 'requests' -__version__ = '0.3.2' -__build__ = 0x000302 +__version__ = '0.3.3' +__build__ = 0x000303 __author__ = 'Kenneth Reitz' __license__ = 'ISC' __copyright__ = 'Copyright 2011 Kenneth Reitz' @@ -460,7 +460,7 @@ def request(method, url, **kwargs): :param timeout: (optional) Float describing the timeout of the request. """ data = kwargs.pop('data', dict()) or kwargs.pop('params', dict()) - + r = Request(method=method, url=url, data=data, headers=kwargs.pop('headers', {}), cookiejar=kwargs.pop('cookies', None), files=kwargs.pop('files', None), auth=kwargs.pop('auth', auth_manager.get_auth(url)),