import ConnectionError

diff --git a/requests/__init__.py b/requests/__init__.py
index 05c9b82c34a56a2fb4539bd1466186275726bea1..eb6639f97bb335ba75dfe2ada8d600a30ab85e37 100644 (file)
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@ -28,6 +28,6 @@ from .api import request, get, head, post, patch, put, delete
 from .sessions import session
 from .status_codes import codes
 from .exceptions import (
-    RequestException, AuthenticationError, Timeout, URLRequired,
-    TooManyRedirects, HTTPError
+    RequestException, Timeout, URLRequired,
+    TooManyRedirects, HTTPError, ConnectionError
 )

diff --git a/requests/models.py b/requests/models.py
index 3a30aa03ca332c9909f2cadde682327c866100b5..3b711cf54e0911f59b6989a397baa71428e965b3 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -444,7 +444,7 @@ class Response(object):
         self.cookies = {}
 
         #: Dictionary of configurations for this request.
-        self.config = None
+        self.config = {}
 
 
     def __repr__(self):