Better error handling

geduldig · geduldig · commit 1e35ee4edf40 · 2015-01-14T20:18:32.000-05:00
diff --git a/TwitterAPI/TwitterAPI.py b/TwitterAPI/TwitterAPI.py
@@ -8,7 +8,7 @@
 import json
 import logging
 import requests
-from requests.exceptions import ConnectionError, SSLError
+from requests.exceptions import ConnectionError, ReadTimeout, SSLError
 from requests.packages.urllib3.exceptions import ReadTimeoutError, ProtocolError
 from requests_oauthlib import OAuth1
 from .TwitterError import *
@@ -230,7 +230,7 @@ def _iter_stream(self):
                             item = self.stream.read(nbytes)
                         break
     	        yield item
-            except (ConnectionError, ProtocolError, ReadTimeoutError, SSLError) as e:
+            except (ConnectionError, ProtocolError, ReadTimeout, ReadTimeoutError, SSLError) as e:
                 # client must re-connect
                 logging.info('%s %s' % (type(e), e.message))
                 raise TwitterConnectionError(e)
diff --git a/TwitterAPI/TwitterRestPager.py b/TwitterAPI/TwitterRestPager.py
@@ -5,7 +5,7 @@
 import logging
 import time
 import requests
-from requests.exceptions import ConnectionError, SSLError
+from requests.exceptions import ConnectionError, ReadTimeout, SSLError
 from requests.packages.urllib3.exceptions import ReadTimeoutError, ProtocolError
 from .TwitterError import *
 
@@ -77,7 +77,7 @@ def get_iterator(self, wait=5, new_tweets=False):
                     self.params['since_id'] = str(id)
                 else:
                     self.params['max_id'] = str(id - 1)
-            except (ConnectionError, ProtocolError, ReadTimeoutError, SSLError) as e:
+            except (ConnectionError, ProtocolError, ReadTimeout, ReadTimeoutError, SSLError) as e:
                 # client must re-connect
                 logging.warning('%s %s' % (type(e), e.message))
                 continue
