From 6779827936d0231fe36bc7b9b25d58e1eca6929c Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Wed, 10 Apr 2013 17:12:26 -0700 Subject: [PATCH] Remove default RedditError code. This conflicts with the wiki's notion that error objects without codes set aren't fatal. --- r2/r2/controllers/multi.py | 3 +++ r2/r2/lib/errors.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/r2/r2/controllers/multi.py b/r2/r2/controllers/multi.py index 3ba562598..86480a290 100644 --- a/r2/r2/controllers/multi.py +++ b/r2/r2/controllers/multi.py @@ -57,6 +57,9 @@ class MultiApiController(RedditController, OAuth2ResourceController): RedditController.pre(self) def on_validation_error(self, error): + if not error.code: + return + abort(reddit_http_error( code=error.code, error_name=error.name, diff --git a/r2/r2/lib/errors.py b/r2/r2/lib/errors.py index 8360e2e95..e5e69f487 100644 --- a/r2/r2/lib/errors.py +++ b/r2/r2/lib/errors.py @@ -146,7 +146,7 @@ def add_error_codes(new_codes): class RedditError(Exception): name = None fields = None - code = 400 + code = None def __init__(self, name=None, msg_params=None, fields=None, code=None): Exception.__init__(self)