kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/rewrite

Browse Source 
Conflicts:
	requests/__init__.py
This commit is contained in:
Kenneth Reitz
2011-10-27 00:57:03 -04:00
parent a957bcfd7b e43b438729
commit 5b54b3e53f
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test_requests.py
+2 -1
View File
@@ -10,6 +10,7 @@ import unittest
import requests
import envoy
from urllib2 import HTTPError
try:
import omnijson as json
@@ -240,7 +241,7 @@ class RequestsTestSuite(unittest.TestCase):
def test_status_raising(self):
r = requests.get(httpbin('status', '404'))
self.assertRaises(requests.HTTPError, r.raise_for_status)
self.assertRaises(HTTPError, r.raise_for_status)
r = requests.get(httpbin('status', '200'))
self.assertFalse(r.error)