github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-29 16:58:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename "error" param to be a bit more pedantic.

Browse Source 
As we more further towards errors being actual objects.
This commit is contained in:
Max Goodman
2013-02-20 14:08:52 -08:00
parent 5db4b4d755
commit 4b08a17d09
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,26 +204,26 @@ class ErrorSet(object):
class ForbiddenError(HTTPForbidden):
def __init__(self, error):
def __init__(self, error_name):
HTTPForbidden.__init__(self)
self.explanation = error_list[error]
self.explanation = error_list[error_name]
class BadRequestError(HTTPBadRequest):
def __init__(self, error):
def __init__(self, error_name):
HTTPBadRequest.__init__(self)
self.error_data = {
'reason': error,
'explanation': error_list[error],
'reason': error_name,
'explanation': error_list[error_name],
}
def reddit_http_error(code=400, error='UNKNOWN_ERROR', **data):
def reddit_http_error(code=400, error_name='UNKNOWN_ERROR', **data):
exc = status_map[code]()
data['reason'] = exc.explanation = error
if error in error_list:
data['explanation'] = exc.explanation = error_list[error]
data['reason'] = exc.explanation = error_name
if error_name in error_list:
data['explanation'] = exc.explanation = error_list[error_name]
# omit 'fields' json attribute if it is empty
if 'fields' in data and not data['fields']: