Merge branch 'develop'

gui/slick/views/home.mako

@@ -615,7 +615,7 @@ $(document).ready(function(){
 
     <tfoot class="hidden-print">
         <tr>
-            <th rowspan="1" colspan="1" align="center"><a href="${sbRoot}/home/addShows/">Add Show</a></th>
+            <th rowspan="1" colspan="1" align="center"><a href="${sbRoot}/home/addShows/">Add ${('Show', 'Anime')[curListType == 'Anime']}</a></th>
             <th>&nbsp;</th>
             <th>&nbsp;</th>
             <th>&nbsp;</th>

sickbeard/helpers.py

@@ -1358,6 +1358,11 @@ def getURL(url, post_data=None, params={}, headers={}, timeout=30, session=None,
     """
 
     session = _setUpSession(session, headers)
+
+    for param in params or {}:
+        if isinstance(params[param], unicode):
+            params[param] = params[param].encode('utf-8')
+
     session.params = params
 
     try:
@@ -1405,7 +1410,7 @@ def getURL(url, post_data=None, params={}, headers={}, timeout=30, session=None,
         return
 
     attempts = 0
-    while(gzip and len(resp.content) > 1 and resp.content[0] == '\x1f' and resp.content[1] == '\x8b' and attempts < 3):
+    while gzip and len(resp.content) > 1 and resp.content[0] == '\x1f' and resp.content[1] == '\x8b' and attempts < 3:
         attempts += 1
         resp._content = gzip.GzipFile(fileobj=_StringIO(resp.content)).read()
 

sickbeard/providers/generic.py

@@ -135,10 +135,6 @@ class GenericProvider:
         for providers with special URL requirements (like cookies)
         """
 
-        # check for auth
-        if not self._doLogin():
-            return
-
         if self.proxy.isEnabled():
             self.headers.update({'Referer': self.proxy.getProxyURL()})
             self.proxyGlypeProxySSLwarning = self.proxy.getProxyURL() + 'includes/process.php?action=sslagree&submit=Continue anyway...'