Fix urllib3 issues

lorien · Sep 29, 2015 · 44d931d · 44d931d
1 parent 3368a7d
commit 44d931d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/grab/transport/urllib3.py b/grab/transport/urllib3.py
@@ -233,10 +233,10 @@ def request(self):
                                body=req.data, timeout=2,
                                retries=retry, headers=req.headers,
                                preload_content=False)
-        except exceptions.ConnectionError as ex:
-            raise error.GrabConnectionError(ex.args[1][0], ex.args[1][1])
-        except exceptions.NewConnectionError as ex:
+        except exceptions.ConnectTimeoutError as ex:
             raise error.GrabConnectionError('Could not create connection')
+        except exceptions.ProtocolError as ex:
+            raise error.GrabConnectionError(ex.args[1][0], ex.args[1][1])
 
         # WTF?
         self.request_head = ''

diff --git a/runtest.py b/runtest.py
@@ -34,7 +34,7 @@
     'test.grab_post_request',
     'test.grab_request', # TODO: fix tests excluded for urllib3
     'test.grab_user_agent',
-    'test.grab_cookies', # !!!!!!! FIX URLLIB3 TEST
+    'test.grab_cookies', # TODO: fix tests excluded for urllib3
     'test.grab_url_processing',
     # Refactor
     'test.grab_proxy',

diff --git a/test/grab_cookies.py b/test/grab_cookies.py
@@ -62,7 +62,6 @@ def test_session(self):
         g.go(self.server.get_url())
         self.assertTrue(len(self.server.request['cookies']) == 0)
 
-    @exclude_transport('urllib3')
     def test_redirect_session(self):
         g = build_grab()
         self.server.response['cookies'] = {'foo': 'bar'}.items()