Merge pull request #585 from SickRage/no-cachecontrol

Let's see if we can live without cachecontrol

lib/tvdb_api/tvdb_api.py

@@ -565,8 +565,9 @@ class Tvdb:
 
             # get response from TVDB
             if self.config['cache_enabled']:
-
-                session = CacheControl(sess=self.config['session'], cache=caches.FileCache(self.config['cache_location'], use_dir_lock=True), cache_etags=False)
+                # Lets try without caching sessions to disk for awhile
+                # session = CacheControl(sess=self.config['session'], cache=caches.FileCache(self.config['cache_location'], use_dir_lock=True), cache_etags=False)
+                session = self.config['session']
                 if self.config['proxy']:
                     log().debug("Using proxy for URL: %s" % url)
                     session.proxies = {

sickbeard/helpers.py

@@ -1379,8 +1379,9 @@ def _setUpSession(session, headers):
     """
 
     # request session
-    cache_dir = sickbeard.CACHE_DIR or _getTempDir()
-    session = CacheControl(sess=session, cache=caches.FileCache(ek(os.path.join, cache_dir, 'sessions'), use_dir_lock=True), cache_etags=False)
+    # Lets try without caching sessions to disk for awhile
+    # cache_dir = sickbeard.CACHE_DIR or _getTempDir()
+    # session = CacheControl(sess=session, cache=caches.FileCache(ek(os.path.join, cache_dir, 'sessions'), use_dir_lock=True), cache_etags=False)
 
     # request session clear residual referer
     # pylint: disable=superfluous-parens