From 4a3a1a9858b0d9a76c3e423ea223fbb685b7c116 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Wed, 2 Jan 2013 18:29:33 -0800 Subject: [PATCH] reddit_base: Fix incorrect "abort" import. This was causing the fancy abort(SomeExceptionClass) style aborts to fail because the pylons abort function didn't support that. --- r2/r2/controllers/reddit_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py index f221905b9..acf5edbeb 100644 --- a/r2/r2/controllers/reddit_base.py +++ b/r2/r2/controllers/reddit_base.py @@ -38,14 +38,14 @@ import babel.core from mako.filters import url_escape from pylons import c, g, request, response -from pylons.controllers.util import abort, redirect_to +from pylons.controllers.util import redirect_to from pylons.i18n import _ from pylons.i18n.translation import LanguageError from r2.config.extensions import is_api from r2.lib import filters, pages, utils from r2.lib.authentication import authenticate_user -from r2.lib.base import BaseController +from r2.lib.base import BaseController, abort from r2.lib.cache import make_key, MemcachedError from r2.lib.errors import ( ErrorSet,