From 1ac24bf9e6e8bf5a466be553721a955da3e6959f Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Fri, 17 May 2013 16:26:08 -0700 Subject: [PATCH] Modularize multi API JSON formatting function. --- r2/r2/controllers/multi.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/r2/r2/controllers/multi.py b/r2/r2/controllers/multi.py index 594b93bfd..72f63d4c9 100644 --- a/r2/r2/controllers/multi.py +++ b/r2/r2/controllers/multi.py @@ -79,6 +79,10 @@ class MultiApiController(RedditController, OAuth2ResourceController): resp = [w.render() for w in wrapped] return self.api_wrapper(resp) + def _format_multi(self, multi): + resp = wrap_things(multi)[0].render() + return self.api_wrapper(resp) + @require_oauth2_scope("read") @api_doc( api_section.multis, @@ -87,8 +91,7 @@ class MultiApiController(RedditController, OAuth2ResourceController): @validate(multi=VMultiByPath("multipath", require_view=True)) def GET_multi(self, multi): """Fetch a multi's data and subreddit list by name.""" - resp = wrap_things(multi)[0].render() - return self.api_wrapper(resp) + return self._format_multi(multi) @require_oauth2_scope("subscribe") @api_doc(api_section.multis, extends=GET_multi) @@ -140,8 +143,7 @@ class MultiApiController(RedditController, OAuth2ResourceController): raise RedditError('MULTI_TOO_MANY_SUBREDDITS', code=409) multi._commit() - - return self.GET_multi(multipath=info['path']) + return self._format_multi(multi) @require_oauth2_scope("subscribe") @api_doc(api_section.multis, extends=GET_multi)