Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix recursion depth error in _doLogin #2465

Merged
merged 1 commit into from
Sep 9, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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