github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-29 00:38:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

TooManySubredditsException -> TooManySubredditsError.

Browse Source
This commit is contained in:
Max Goodman
2013-05-20 18:23:01 -07:00
parent 87375a1219
commit eeb1d6f2ea
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
r2/r2/controllers/multi.py
View File

@@ -33,7 +33,7 @@ from r2.models.subreddit import (
FakeSubreddit,
Subreddit,
LabeledMulti,
TooManySubredditsException,
TooManySubredditsError,
)
from r2.lib.db import tdb_cassandra
from r2.lib.wrapped import Wrapped
@@ -126,7 +126,7 @@ class MultiApiController(RedditController, OAuth2ResourceController):
try:
multi.add_srs(sr_props)
except TooManySubredditsException as e:
except TooManySubredditsError as e:
multi._revert()
raise RedditError('MULTI_TOO_MANY_SUBREDDITS', code=409)
@@ -228,7 +228,7 @@ class MultiApiController(RedditController, OAuth2ResourceController):
try:
multi.add_srs({sr: {}})
except TooManySubredditsException as e:
except TooManySubredditsError as e:
raise RedditError('MULTI_TOO_MANY_SUBREDDITS', code=409)
else:
multi._commit()

4
r2/r2/models/subreddit.py
View File

@@ -1278,7 +1278,7 @@ class MultiReddit(FakeSubreddit):
return MergedCachedQuery(queries)
class TooManySubredditsException(Exception):
class TooManySubredditsError(Exception):
pass
@@ -1447,7 +1447,7 @@ class LabeledMulti(tdb_cassandra.Thing, MultiReddit):
sr_ids, sr_columns = self.sr_props_to_columns(sr_props)
if len(set(sr_columns) | set(self.sr_columns)) > self.MAX_SR_COUNT:
raise TooManySubredditsException
raise TooManySubredditsError
new_sr_ids = set(sr_ids) - set(self.sr_ids)
new_srs = Subreddit._byID(new_sr_ids, data=True, return_dict=False)