Skip to content

Commit

Permalink
Merge pull request #2465 from SiCKRAGETV/start-recursion-fixes
Browse files Browse the repository at this point in the history
Fix recursion depth error in _doLogin
  • Loading branch information
miigotu committed Sep 9, 2015
2 parents 30a4fbb + a4058bb commit 0af1095
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion sickbeard/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ def getURL(url, post_data=None, params={}, headers={}, timeout=30, session=None,

session = _setUpSession(session, headers)

for param in params:
for param in params or {}:
if isinstance(params[param], unicode):
params[param] = params[param].encode('utf-8')

Expand Down
4 changes: 0 additions & 4 deletions sickbeard/providers/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@ def getURL(self, url, post_data=None, params=None, timeout=30, json=False):
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...'
Expand Down
2 changes: 1 addition & 1 deletion sickbeard/providers/iptorrents.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def findSearchResults(self, show, episodes, search_mode, manualSearch=False, dow

addCacheEntry = False
if not (showObj.air_by_date or showObj.sports):
if search_mode == 'sponly':
if search_mode == 'sponly':
if len(parse_result.episode_numbers):
logger.log(
u"This is supposed to be a season pack search but the result " + title + " is not a valid season pack, skipping it",
Expand Down

0 comments on commit 0af1095

Please sign in to comment.