Commit Graph

2308 Commits

Author SHA1 Message Date
Kenneth Reitz ad311497fa update charade 2012-12-02 10:08:57 +01:00
Kenneth Reitz b60b11e206 Merge remote-tracking branch 'origin/master' 2012-12-01 16:55:14 +01:00
Kenneth Reitz 2eb63be19a chardet fixes! 2012-12-01 16:55:09 +01:00
Kenneth Reitz 426734da51 Merge pull request #977 from ondrowan/patch-2
Update README.rst
2012-11-29 10:59:49 -08:00
Ondrej Slinták ae41c733ea Update README.rst
There was a typo in AUTHORS link - it pointed to develop branch which no longer exists.
2012-11-29 19:58:46 +01:00
Kenneth Reitz a5cb6355ed Merge branch 'master' of github.com:kennethreitz/requests
Conflicts:
	requests/compat.py
	setup.py
2012-11-29 08:35:35 -08:00
Kenneth Reitz 6ead850065 charade 2012-11-29 08:30:07 -08:00
Kenneth Reitz 1960dabafd out with chardet, in with charade 2012-11-29 08:29:02 -08:00
Kenneth Reitz 8f86ff633a Merge pull request #973 from sigmavirus24/fix_972
Fix #972
2012-11-28 08:40:09 -08:00
Kenneth Reitz 4d5c327f6f Merge pull request #976 from futoase/master
Repaired import error.
2012-11-28 08:33:56 -08:00
Keiji Matsuzaki b69854e96e Modified: Change the import statement. 2012-11-29 01:29:13 +09:00
Ian Cordasco fd6b1f0c4e Fix #972
Someone forgot a comma
2012-11-27 22:14:09 -05:00
Kenneth Reitz ccd14ddc81 fixes for python2 2012-11-27 13:08:16 -08:00
Kenneth Reitz 0af19a05ce fix chardet import 2012-11-27 12:52:17 -08:00
Kenneth Reitz f553857beb remove safe mode 2012-11-27 12:42:11 -08:00
Kenneth Reitz 1607a6a3e2 remove danger mode 2012-11-27 12:41:28 -08:00
Kenneth Reitz 95a03532c3 remove strict mode 2012-11-27 12:41:12 -08:00
Kenneth Reitz 400046f911 that shouldn't be neccesary anymore 2012-11-27 12:37:59 -08:00
Kenneth Reitz 71898bb793 chardet2 is magic 2012-11-27 12:36:29 -08:00
Kenneth Reitz ad18d9ddd6 fix setup.py for oauth removal 2012-11-27 11:48:17 -08:00
Kenneth Reitz 4d06e4019f no more oauth 2012-11-27 11:47:17 -08:00
Kenneth Reitz 5c1bc201c4 lawyer up, v2 2012-11-27 11:32:59 -08:00
Kenneth Reitz cc723a64b9 Merge pull request #967 from matthewlmcclure/sign-without-body
Sign requests even if they have no body data.
2012-11-27 10:43:57 -08:00
Matt McClure f02573f743 Sign requests even if they have no body data. 2012-11-27 13:12:21 -05:00
Kenneth Reitz 7fea9afecd Merge remote-tracking branch 'origin/develop' into develop 2012-11-26 20:50:09 -08:00
Kenneth Reitz a1b6ef3f85 how was that still there? 2012-11-26 17:27:35 -08:00
Kenneth Reitz 2dccc8e982 Merge pull request #962 from sigmavirus24/dev_docs
Add a bit more to the developer's documentation
2012-11-26 12:26:38 -08:00
Ian Cordasco 24ed8c9457 Add a bit more to the developer's documentation
I'm not sure what else could be added to satisfy #601. If this is sufficient,
I suggest closing that.
2012-11-26 13:25:02 -05:00
Kenneth Reitz 0d59a27b56 Merge pull request #956 from Lukasa/issue910
Try to resolve OAuth+JSON problems.
2012-11-26 00:40:27 -08:00
Kenneth Reitz d36ceb9d06 Merge pull request #953 from heyman/fix_session_safe_mode
Fixes so that safe_mode works for Sessions
2012-11-26 00:31:45 -08:00
Kenneth Reitz 27faf7aa69 Merge pull request #955 from Lukasa/issue882
Python 3.1 compatibility.
2012-11-26 00:30:49 -08:00
Kenneth Reitz 5ee00a75e0 Merge pull request #957 from sigmavirus24/fix_223
Attach Content-Length to everything.
2012-11-24 19:54:29 -08:00
Ian Cordasco b93fbd30c3 Fix python 3 tests. 2012-11-24 22:43:52 -05:00
Ian Cordasco 61f16d1ddc Handle files as well. 2012-11-24 22:02:14 -05:00
Ian Cordasco f003025a37 Attach Content-Length to everything.
Closes #223
2012-11-24 21:47:47 -05:00
Cory Benfield 31f74bd02e Make OAuth handle less-common body data better.
Related to Issue #910. Specifically, OAuth won't sign the request unless
it gets a body type that is urlencoded or multipart. This is overly
restrictive. The correct behaviour is to sign the message without
including the body as part of the signature.
2012-11-24 21:17:29 +00:00
Cory Benfield d5f9a2a51c Avoid using callable().
Callable() is not included in Python 3.1, so we shouldn't use it.
2012-11-24 12:15:30 +00:00
Jonatan Heyman 8269ee7266 Fixed so that safe_mode works for Sessions 2012-11-23 16:48:51 +01:00
Kenneth Reitz 991f47ac08 Merge pull request #942 from Lukasa/issue883
MockRequest needs a type property for Py3.3
2012-11-23 02:04:21 -08:00
Kenneth Reitz 1d1eb994dc Merge pull request #945 from Lukasa/develop
Respect the no_proxy environment variable.
2012-11-23 02:03:28 -08:00
Kenneth Reitz 68224252e2 Merge pull request #947 from JohnPeacockMessageSystems/develop
Only return a path if the cacert.pem file exists.
2012-11-23 02:02:18 -08:00
Kenneth Reitz 36c32aead2 Merge pull request #948 from mwielgoszewski/develop
Back to issue #630, .isalnum() was sufficient in addressing the issue.
2012-11-23 02:01:20 -08:00
Marcin Wielgoszewski 18be26fc2a Back to issue #630, .isalnum() was sufficient in addressing the issue.
Adding a try/except block just masks any issues that are raised here, issues that the developer should definitely be made aware of.
2012-11-22 11:10:22 -05:00
Kenneth Reitz 59dea188da Merge remote-tracking branch 'origin/develop' into develop 2012-11-21 17:59:11 -05:00
Kenneth Reitz 284deaa609 obama 2012-11-21 17:58:13 -05:00
John Peacock 68f7fae7c3 Merge branch 'develop' of github.com:JohnPeacockMessageSystems/requests into develop 2012-11-21 13:41:39 -05:00
John Peacock 20cd46426f Only return a path if the cacert.pem file exists.
This will permit the deletion of just that one file in order
to fall back to the [probably more accurate but less consistent]
Distro provided CA certs.
2012-11-21 13:41:16 -05:00
John Peacock c5fddb95ed Only return a path if the cacert.pem file exists.
This will permit the deletion of just that one file in order
to fall back to the [probably more accurate but less consistent]
Distro provided CA certs.
2012-11-21 13:34:03 -05:00
Cory Benfield c02520ed99 Make sure we reset environment variables.
Turns out nose runs all the tests in one process, so changing the
os.environ dictionary makes everything go horribly wrong.
2012-11-18 12:31:55 +00:00
Cory Benfield 8da100f652 Respect the no_proxy environment variable.
This change is in response to issue #879.
2012-11-18 12:06:33 +00:00