Make subliminal work with Requests 1.0+

libs/subliminal/services/__init__.py

@@ -81,7 +81,8 @@ class ServiceBase(object):
     def init(self):
         """Initialize connection"""
         logger.debug(u'Initializing %s' % self.__class__.__name__)
-        self.session = requests.session(timeout=10, headers={'User-Agent': self.user_agent})
+        self.session = requests.session()
+        self.session.headers.update({'User-Agent': self.user_agent})
 
     def init_cache(self):
         """Initialize cache, make sure it is loaded from disk"""
@@ -191,7 +192,7 @@ class ServiceBase(object):
         """
         logger.info(u'Downloading %s in %s' % (url, filepath))
         try:
-            r = self.session.get(url, headers={'Referer': url, 'User-Agent': self.user_agent})
+            r = self.session.get(url, timeout = 10, headers = {'Referer': url, 'User-Agent': self.user_agent})
             with open(filepath, 'wb') as f:
                 f.write(r.content)
         except Exception as e:
@@ -212,7 +213,7 @@ class ServiceBase(object):
         logger.info(u'Downloading %s in %s' % (url, filepath))
         try:
             zippath = filepath + '.zip'
-            r = self.session.get(url, headers={'Referer': url, 'User-Agent': self.user_agent})
+            r = self.session.get(url, timeout = 10, headers = {'Referer': url, 'User-Agent': self.user_agent})
             with open(zippath, 'wb') as f:
                 f.write(r.content)
             if not zipfile.is_zipfile(zippath):