errors.py: Move from controllers -> lib

Since these are not directly related to controllers.

r2/r2/controllers/error.py

@@ -30,7 +30,7 @@ from pylons import c, request, g
 from r2.config import extensions
 from pylons.i18n import _
 import random as rand
-from r2.controllers.errors import ErrorSet
+from r2.lib.errors import ErrorSet
 from r2.lib.filters import safemarkdown, unsafe, websafe_json
 
 import json

r2/r2/controllers/front.py

@@ -45,7 +45,7 @@ from r2.lib.search import (SearchQuery, SubredditSearchQuery, SearchException,
 from r2.lib import jsontemplates
 from r2.lib import sup
 import r2.lib.db.thing as thing
-from errors import errors
+from r2.lib.errors import errors
 from listingcontroller import ListingController
 from oauth2 import OAuth2ResourceController, require_oauth2_scope
 from api_docs import api_doc, api_section

r2/r2/controllers/oauth2.py

@@ -34,7 +34,7 @@ from r2.models import Account
 from r2.models.token import (
     OAuth2Client, OAuth2AuthorizationCode, OAuth2AccessToken,
     OAuth2RefreshToken, OAuth2Scope)
-from r2.controllers.errors import ForbiddenError, errors
+from r2.lib.errors import ForbiddenError, errors
 from validator import (
     nop, validate, VRequired, VOneOf, VUser, VModhash, VOAuth2ClientID,
     VOAuth2Scope, VOAuth2RefreshToken)

r2/r2/controllers/reddit_base.py

@@ -42,12 +42,6 @@ from pylons.i18n import _
 from pylons.i18n.translation import LanguageError
 
 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,
@@ -64,6 +58,12 @@ 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.errors import (
+    ErrorSet,
+    BadRequestError,
+    ForbiddenError,
+    errors,
+)
 from r2.lib.strings import strings
 from r2.lib.template_helpers import add_sr
 from r2.lib.tracking import encrypt, decrypt

r2/r2/controllers/validator/validator.py

@@ -36,9 +36,9 @@ from r2.models import *
 from r2.lib.authorize import Address, CreditCard
 from r2.lib.utils import constant_time_compare
 
-from r2.controllers.errors import errors, UserRequiredException
-from r2.controllers.errors import VerifiedUserRequiredException
-from r2.controllers.errors import GoldRequiredException
+from r2.lib.errors import errors, UserRequiredException
+from r2.lib.errors import VerifiedUserRequiredException
+from r2.lib.errors import GoldRequiredException
 
 from copy import copy
 from datetime import datetime, timedelta

r2/r2/controllers/wiki.py

@@ -49,7 +49,6 @@ from r2.lib.pages.wiki import (WikiPageView, WikiNotFound, WikiRevisions,
 from r2.config.extensions import set_extension
 from r2.lib.template_helpers import add_sr
 from r2.lib.db import tdb_cassandra
-from r2.controllers.errors import errors
 from r2.models.listing import WikiRevisionListing
 from r2.lib.pages.things import default_thing_wrapper
 from r2.lib.pages import BoringPage
@@ -62,7 +61,7 @@ from r2.lib.pages import PaneStack
 from r2.lib.utils import timesince
 from r2.config import extensions
 from r2.lib.base import abort
-from r2.controllers.errors import WikiError
+from r2.lib.errors import WikiError
 
 import json
 

r2/r2/models/subreddit.py

@@ -34,6 +34,7 @@ from account import Account, AccountsActiveBySR
 from printable import Printable
 from r2.lib.db.userrel import UserRel
 from r2.lib.db.operators import lower, or_, and_, desc
+from r2.lib.errors import UserRequiredException
 from r2.lib.memoize import memoize
 from r2.lib.utils import tup, interleave_lists, last_modified_multi, flatten
 from r2.lib.utils import timeago, summarize_markdown
@@ -875,7 +876,6 @@ class FriendsSR(FakeSubreddit):
     def get_links(self, sort, time):
         from r2.lib.db import queries
         from r2.models import Link
-        from r2.controllers.errors import UserRequiredException
 
         if not c.user_is_loggedin:
             raise UserRequiredException
@@ -910,7 +910,6 @@ class FriendsSR(FakeSubreddit):
     def get_all_comments(self):
         from r2.lib.db import queries
         from r2.models import Comment
-        from r2.controllers.errors import UserRequiredException
 
         if not c.user_is_loggedin:
             raise UserRequiredException