projects / services / python-requests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4f7d67 875c9e1)
Merge pull request #767 from stefanp/develop
authorKenneth Reitz <me@kennethreitz.com>
Wed, 8 Aug 2012 20:23:10 +0000 (13:23 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 8 Aug 2012 20:23:10 +0000 (13:23 -0700)
Wrap socket.error in ConnectionError (+ unit tests)

1  2 
requests/models.py patch | diff1 | diff2 | blob | history
tests/test_requests.py patch | diff1 | diff2 | blob | history

diff --cc requests/models.py
Simple merge
diff --cc tests/test_requests.py
Simple merge
Domain: SCM / CI Services;