Merge branch 'refs/heads/develop' into nosql

Conflicts:
	couchpotato/core/media/__init__.py
	couchpotato/core/notifications/trakt/main.py

couchpotato/core/plugins/base.py

@@ -190,7 +190,10 @@ class Plugin(object):
             log.info('Opening url: %s %s, data: %s', (method, url, [x for x in data.keys()] if isinstance(data, dict) else 'with data'))
             response = r.request(method, url, verify = False, **kwargs)
 
-            data = response.content
+            if response.status_code == requests.codes.ok:
+                data = response.content
+            else:
+                response.raise_for_status()
 
             self.http_failed_request[host] = 0
         except (IOError, MaxRetryError, Timeout):

couchpotato/core/plugins/renamer/main.py

@@ -323,7 +323,7 @@ class Renamer(Plugin):
                     cd = 1 if multiple else 0
 
                     for current_file in sorted(list(group['files'][file_type])):
-                        current_file = toUnicode(current_file)
+                        current_file = sp(current_file)
 
                         # Original filename
                         replacements['original'] = os.path.splitext(os.path.basename(current_file))[0]
@@ -610,7 +610,7 @@ class Renamer(Plugin):
         rename_files = {}
 
         def test(s):
-            return current_file[:-len(replacements['ext'])] in s
+            return current_file[:-len(replacements['ext'])] in sp(s)
 
         for extra in set(filter(test, group['files'][extra_type])):
             replacements['ext'] = getExt(extra)