diff --git a/r2/r2/controllers/multi.py b/r2/r2/controllers/multi.py index a63ffff9f..90cba9043 100644 --- a/r2/r2/controllers/multi.py +++ b/r2/r2/controllers/multi.py @@ -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() diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py index 86024a0ce..d1403dcd0 100644 --- a/r2/r2/models/subreddit.py +++ b/r2/r2/models/subreddit.py @@ -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)