github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-30 01:08:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Max Goodman
2013-02-19 15:03:09 -08:00
parent ba78412480
commit 5db4b4d755
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
r2/r2/lib/errors.py
View File

@@ -26,6 +26,7 @@ from pylons import request
from pylons.i18n import _
from copy import copy
error_list = dict((
('USER_REQUIRED', _("please login to do that")),
('HTTPS_REQUIRED', _("this page must be accessed using https")),
@@ -120,8 +121,10 @@ error_list = dict((
('INVALID_PERMISSION_TYPE', _("permissions don't apply to that type of user")),
('INVALID_PERMISSIONS', _('invalid permissions string')),
))
errors = Storage([(e, e) for e in error_list.keys()])
class RedditError(Exception):
name = None
fields = None
@@ -148,7 +151,6 @@ class RedditError(Exception):
return _(self.i18n_message) % self.msg_params
def __iter__(self):
#yield ('num', self.num)
yield ('name', self.name)
yield ('message', _(self.message))
@@ -164,7 +166,7 @@ class ErrorSet(object):
self.errors = {}
def __contains__(self, pair):
"""Expectes an (error_name, field_name) tuple and checks to
"""Expects an (error_name, field_name) tuple and checks to
see if it's in the errors list."""
return self.errors.has_key(pair)
@@ -195,16 +197,18 @@ class ErrorSet(object):
self.errors[(error.name, field_name)] = error
def remove(self, pair):
"""Expectes an (error_name, field_name) tuple and removes it
"""Expects an (error_name, field_name) tuple and removes it
from the errors list."""
if self.errors.has_key(pair):
del self.errors[pair]
class ForbiddenError(HTTPForbidden):
def __init__(self, error):
HTTPForbidden.__init__(self)
self.explanation = error_list[error]
class BadRequestError(HTTPBadRequest):
def __init__(self, error):
HTTPBadRequest.__init__(self)