From ebf76867bda7a45940322e5aa2e3b2bf3404164c Mon Sep 17 00:00:00 2001
From: nramirezuy <nramirez.uy@gmail.com>
Date: Wed, 23 Jul 2014 14:46:43 -0300
Subject: [PATCH] renamed UserTimeoutError and ServerTimeouterror #583

---
 scrapy/contrib/downloadermiddleware/retry.py    |  8 ++++----
 scrapy/tests/test_downloadermiddleware_retry.py | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/scrapy/contrib/downloadermiddleware/retry.py b/scrapy/contrib/downloadermiddleware/retry.py
index 7eba3f78d..9cc54ed48 100644
--- a/scrapy/contrib/downloadermiddleware/retry.py
+++ b/scrapy/contrib/downloadermiddleware/retry.py
@@ -18,9 +18,9 @@ About HTTP errors to consider:
   indicate server overload, which would be something we want to retry
 """
 
-from twisted.internet.defer import TimeoutError as UserTimeoutError
-from twisted.internet.error import TimeoutError as ServerTimeoutError, \
-        DNSLookupError, ConnectionRefusedError, ConnectionDone, ConnectError, \
+from twisted.internet import defer
+from twisted.internet.error import TimeoutError, DNSLookupError, \
+        ConnectionRefusedError, ConnectionDone, ConnectError, \
         ConnectionLost, TCPTimedOutError
 
 from scrapy import log
@@ -33,7 +33,7 @@ class RetryMiddleware(object):
 
     # IOError is raised by the HttpCompression middleware when trying to
     # decompress an empty response
-    EXCEPTIONS_TO_RETRY = (ServerTimeoutError, UserTimeoutError, DNSLookupError,
+    EXCEPTIONS_TO_RETRY = (defer.TimeoutError, TimeoutError, DNSLookupError,
                            ConnectionRefusedError, ConnectionDone, ConnectError,
                            ConnectionLost, TCPTimedOutError, ResponseFailed,
                            IOError)
diff --git a/scrapy/tests/test_downloadermiddleware_retry.py b/scrapy/tests/test_downloadermiddleware_retry.py
index 0ef0505c1..4c771f18e 100644
--- a/scrapy/tests/test_downloadermiddleware_retry.py
+++ b/scrapy/tests/test_downloadermiddleware_retry.py
@@ -1,7 +1,8 @@
 import unittest
-from twisted.internet.error import TimeoutError as ServerTimeoutError, \
-    DNSLookupError, ConnectionRefusedError, ConnectionDone, ConnectError, \
-    ConnectionLost
+from twisted.internet import defer
+from twisted.internet.error import TimeoutError, DNSLookupError, \
+        ConnectionRefusedError, ConnectionDone, ConnectError, \
+        ConnectionLost, TCPTimedOutError
 
 from scrapy import optional_features
 from scrapy.contrib.downloadermiddleware.retry import RetryMiddleware
@@ -41,7 +42,6 @@ class RetryTest(unittest.TestCase):
 
     def test_dont_retry_exc(self):
         req = Request('http://www.scrapytest.org/503', meta={'dont_retry': True})
-        rsp = Response('http://www.scrapytest.org/503', body='', status=503)
 
         r = self.mw.process_exception(req, DNSLookupError(), self.spider)
         assert r is None
@@ -64,9 +64,9 @@ class RetryTest(unittest.TestCase):
         assert self.mw.process_response(req, rsp, self.spider) is rsp
 
     def test_twistederrors(self):
-        exceptions = [ServerTimeoutError, DNSLookupError,
-                      ConnectionRefusedError, ConnectionDone, ConnectError,
-                      ConnectionLost]
+        exceptions = [defer.TimeoutError, TCPTimedOutError, TimeoutError,
+                DNSLookupError, ConnectionRefusedError, ConnectionDone,
+                ConnectError, ConnectionLost]
         if 'http11' in optional_features:
             exceptions.append(ResponseFailed)