summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Version bump.1.7.1Andrey Petrov2013-09-252-3/+5
* Merge branch 'master' into releaseAndrey Petrov2013-09-2519-100/+1002
|\
| * Merge pull request #246 from kevinburke/eagainAndrey Petrov2013-09-152-7/+36
| |\
| | * fix if spacingKevin Burke2013-09-141-2/+2
| | * inline some exception raisesKevin Burke2013-09-131-15/+10
| | * use python 2.6-compatible set syntaxKevin Burke2013-09-131-1/+1
| | * Add linkKevin Burke2013-09-131-1/+1
| | * Catch zero read timeouts in Python 3Kevin Burke2013-09-131-4/+19
| | * Also call ReadTimeout on sockets that receive an EAGAINKevin Burke2013-09-122-0/+19
| |/
| * Factor out REDIRECT_STATUSES.Andrey Petrov2013-09-111-1/+2
| * Merge pull request #243 from oohlaf/permanent-redirectAndrey Petrov2013-09-112-2/+2
| |\
| | * Support redirect on 308Olaf Conradi2013-09-112-2/+2
| * | Code style.Andrey Petrov2013-09-111-20/+15
| * | Export Timeout to the urllib3 root namespace, and CHANGES.Andrey Petrov2013-09-112-2/+3
| * | Merge pull request #231 from kevinburke/connect_timeoutAndrey Petrov2013-09-1112-75/+763
| |\ \ | | |/ | |/|
| | * Update CONTRIBUTORSKevin Burke2013-09-111-0/+3
| | * Fixes suggested by @shazow during code reviewKevin Burke2013-09-092-24/+27
| | * remove extraneous commentsKevin Burke2013-09-091-2/+0
| | * Document the behavior of read/total timeoutsKevin Burke2013-09-051-9/+20
| | * formatting consistencyKevin Burke2013-09-051-7/+7
| | * fix another doc typoKevin Burke2013-09-051-1/+1
| | * typoKevin Burke2013-09-051-1/+1
| | * Add usage exampleKevin Burke2013-09-051-0/+8
| | * Merge master into branch.Kevin Burke2013-09-053-17/+201
| | |\ | | |/ | |/|
| * | Merge pull request #239 from shazow/238-deprecate-strictAndrey Petrov2013-09-041-7/+14
| |\ \
| | * | Ignore strict Connection param in Py3.Andrey Petrov2013-09-041-7/+14
| |/ /
| * | Updated ConnectionPool example in doc (fixed #237).Andrey Petrov2013-09-031-4/+4
| * | Merge pull request #235 from t-8ch/incorrect_proxyerrorAndrey Petrov2013-08-301-5/+2
| |\ \
| | * | don't raise ProxyError in VerifiedHTTPSConnectionThomas Weißschuh2013-08-301-5/+2
| |/ /
| * | Merge pull request #234 from tmclane/dont_close_noneAndrey Petrov2013-08-291-1/+2
| |\ \
| | * | avoid calling 'close' on a None objectTravis McLane2013-08-281-1/+2
| |/ /
| * | Merge pull request #233 from t-8ch/pyopenssl_want_read_errorAndrey Petrov2013-08-271-8/+179
| |\ \
| | * | pyopenssl: make getpeercert behave like stdlibThomas Weißschuh2013-08-271-1/+2
| | * | pyopenssl: fix WantReadError when using a timeoutThomas Weißschuh2013-08-271-7/+177
| |/ /
| | * Clean up the documentation for timeoutsKevin Burke2013-09-053-26/+69
| | * Further update commentKevin Burke2013-08-281-1/+2
| | * Update Timeout class interfaceKevin Burke2013-08-282-32/+40
| | * Refactor Timeout start/stop behaviorKevin Burke2013-08-284-61/+43
| | * Minor fixesKevin Burke2013-08-252-3/+3
| | * Remove timeout clone() duplicationKevin Burke2013-08-251-19/+7
| | * WhoopsKevin Burke2013-08-255-323/+140
| | * dont get fancy with exception reraisingKevin Burke2013-08-241-4/+4
| | * Remove duplicate call to settimeoutKevin Burke2013-08-244-30/+44
| | * Rename RequestTimeoutError to ReadTimeoutErrorKevin Burke2013-08-247-24/+24
| | * Re-raise SocketTimeout as a read timeoutKevin Burke2013-08-242-13/+17
| | * Rename request timeout to read timeoutKevin Burke2013-08-237-66/+71
| | * rename from_legacyKevin Burke2013-08-233-8/+8
| | * Convert timeout ValueErrors to TimeoutStateErrorsKevin Burke2013-08-233-12/+25
| | * add section for wmi-oauth apiPavel Kirichenko2013-08-231-2/+2
| | * add section for wmi-oauth apiPavel Kirichenko2013-08-231-3/+3