From c9ad15aa540678c4ffc674cf8300315472c8fa5d Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Thu, 27 Feb 2014 19:03:28 -0800 Subject: [PATCH] Fix dead code references to controller "abort" method. These are not the aborts you are looking for. --- r2/r2/controllers/api.py | 6 +++--- r2/r2/controllers/toolbar.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index 01a4bd5fc..2ca1c95d8 100755 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -1790,7 +1790,7 @@ class ApiController(RedditController): """ # just in case we need to kill this feature from XSS if g.css_killswitch: - return self.abort(403,'forbidden') + return abort(403, 'forbidden') if form.has_errors("img_name", errors.BAD_CSS_NAME): return @@ -1813,7 +1813,7 @@ class ApiController(RedditController): """ # just in case we need to kill this feature from XSS if g.css_killswitch: - return self.abort(403,'forbidden') + return abort(403, 'forbidden') if c.site.header: c.site.header = None c.site.header_size = None @@ -2554,7 +2554,7 @@ class ApiController(RedditController): parent = VByName('parent_id')) def POST_moremessages(self, form, jquery, parent): if not parent.can_view_slow(): - return self.abort(403,'forbidden') + return abort(403, 'forbidden') if parent.sr_id: builder = SrMessageBuilder(parent.subreddit_slow, diff --git a/r2/r2/controllers/toolbar.py b/r2/r2/controllers/toolbar.py index d8b1a72aa..75195ed24 100644 --- a/r2/r2/controllers/toolbar.py +++ b/r2/r2/controllers/toolbar.py @@ -197,7 +197,7 @@ class ToolbarController(RedditController): links = list(wrap_links(link)) if not links: # they aren't allowed to see this link - return self.abort(403, 'forbidden') + return abort(403, 'forbidden') link = links[0] wrapper = make_wrapper(render_class = StarkComment,