Fixed typo from refactor.

This commit is contained in:
Michael Lazar
2015-04-05 21:34:46 -07:00
parent 6036d90e12
commit aa91c18a25

View File

@@ -240,14 +240,11 @@ class SubredditContent(BaseContent):
self.get(0) self.get(0)
except (praw.errors.APIException, requests.HTTPError, except (praw.errors.APIException, requests.HTTPError,
praw.errors.RedirectException): praw.errors.RedirectException):
raise SubredditError(display_name) raise SubredditError(name)
@classmethod @classmethod
def from_name(cls, reddit, name, loader, order='hot', query=None): def from_name(cls, reddit, name, loader, order='hot', query=None):
if order not in ['hot', 'top', 'rising', 'new', 'controversial']:
raise SubredditError(display_name)
name = name.strip(' /') # Strip leading and trailing backslashes name = name.strip(' /') # Strip leading and trailing backslashes
if name.startswith('r/'): if name.startswith('r/'):
name = name[2:] name = name[2:]
@@ -260,6 +257,9 @@ class SubredditContent(BaseContent):
if order != 'hot': if order != 'hot':
display_name += '/{}'.format(order) display_name += '/{}'.format(order)
if order not in ['hot', 'top', 'rising', 'new', 'controversial']:
raise SubredditError(name)
if name == 'me': if name == 'me':
if not reddit.is_logged_in(): if not reddit.is_logged_in():
raise AccountError raise AccountError