From 15817179d5d87e124d13f400f820377ad5987d28 Mon Sep 17 00:00:00 2001
From: Keith Mitchell <kemitche@reddit.com>
Date: Tue, 18 Dec 2012 11:12:16 -0800
Subject: [PATCH] reddit_base: clean up imports

---
 r2/r2/controllers/reddit_base.py | 95 ++++++++++++++++++++++----------
 1 file changed, 65 insertions(+), 30 deletions(-)

diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py
index 082453d6e..d42a0c938 100644
--- a/r2/r2/controllers/reddit_base.py
+++ b/r2/r2/controllers/reddit_base.py
@@ -20,12 +20,54 @@
 # Inc. All Rights Reserved.
 ###############################################################################
 
+import babel.core
+import locale
+import re
+import simplejson
+import socket
+import time
+
+from Cookie import CookieError
+from copy import copy
+from datetime import datetime, timedelta
+from functools import wraps
+from hashlib import sha1
+from urllib import quote, unquote
+from urlparse import urlparse
+
 from mako.filters import url_escape
-from pylons import c, g, request
-from pylons.controllers.util import redirect_to
+from pylons import c, g, request, response
+from pylons.controllers.util import abort, redirect_to
 from pylons.i18n import _
 from pylons.i18n.translation import LanguageError
-from r2.lib import pages, utils, filters, amqp, stats
+
+from r2.config.extensions import is_api
+from r2.controllers.errors import (
+    ErrorSet,
+    BadRequestError,
+    ForbiddenError,
+    errors,
+)
+from r2.controllers.validator import (
+    build_arg_list,
+    chksrname,
+    fullname_regex,
+    valid_jsonp_callback,
+    validate,
+    VByName,
+    VCount,
+    VLength,
+    VLimit,
+    VTarget,
+)
+from r2.lib import filters, pages, utils
+from r2.lib.authentication import authenticate_user
+from r2.lib.base import BaseController
+from r2.lib.cache import make_key, MemcachedError
+from r2.lib.strings import strings
+from r2.lib.template_helpers import add_sr
+from r2.lib.tracking import encrypt, decrypt
+from r2.lib.translation import set_lang
 from r2.lib.utils import (
     SimpleSillyStub,
     UniqueIterator,
@@ -33,34 +75,27 @@ from r2.lib.utils import (
     is_subdomain,
     is_throttled,
 )
-from r2.lib.cache import LocalCache, make_key, MemcachedError
-import random as rand
-from r2.models.account import FakeAccount, valid_feed, valid_admin_cookie
-from r2.models.subreddit import Subreddit, Frontpage
-from r2.models import *
-from errors import ErrorSet, BadRequestError, ForbiddenError, errors
-from validator import *
-from r2.lib.template_helpers import add_sr
-from r2.config.extensions import is_api
-from r2.lib.translation import set_lang
-from r2.lib.contrib import ipaddress
-from r2.lib.base import BaseController, proxyurl, abort
-from r2.lib.authentication import authenticate_user
+from r2.models import (
+    All,
+    check_request,
+    DefaultSR,
+    DomainSR,
+    FakeAccount,
+    FakeSubreddit,
+    Friends,
+    Frontpage,
+    Link,
+    MultiReddit,
+    NotFound,
+    Random,
+    RandomNSFW,
+    Sub,
+    Subreddit,
+    valid_admin_cookie,
+    valid_feed,
+    valid_otp_cookie,
+)
 
-from Cookie import CookieError
-from copy import copy
-from Cookie import CookieError
-from datetime import datetime, timedelta
-from hashlib import sha1, md5
-from urllib import quote, unquote
-import simplejson
-import locale, socket
-import babel.core
-from functools import wraps
-import time
-
-from r2.lib.tracking import encrypt, decrypt
-from pylons import Response
 
 NEVER = 'Thu, 31 Dec 2037 23:59:59 GMT'
 DELETE = 'Thu, 01-Jan-1970 00:00:01 GMT'