From 3b93eb3e274834b7cc588372974d9bd998a97bdc Mon Sep 17 00:00:00 2001 From: Ricky Ramirez Date: Tue, 18 Jun 2013 16:33:45 -0700 Subject: [PATCH] front: Remove duplicate import. has_opted_out is defined in mail_queue, but is also exported from models/__init__.py --- r2/r2/controllers/front.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py index e9a5c54c1..65c3d90e3 100755 --- a/r2/r2/controllers/front.py +++ b/r2/r2/controllers/front.py @@ -41,7 +41,7 @@ from r2.lib.utils import to36, sanitize_url, check_cheating, title_to_url from r2.lib.utils import query_string, UrlParser, link_from_url, url_links_builder from r2.lib.template_helpers import get_domain from r2.lib.filters import unsafe, _force_unicode, _force_utf8 -from r2.lib.emailer import has_opted_out, Email +from r2.lib.emailer import Email from r2.lib.db.operators import desc from r2.lib.db import queries from r2.lib.db.tdb_cassandra import MultiColumnQuery