github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-02-12 15:35:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Modularize multi API JSON formatting function.

Browse Source
This commit is contained in:
Max Goodman
2013-05-17 16:26:08 -07:00
parent 655bff522d
commit 1ac24bf9e6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)