From 90c38d9902728308453f7e043738cffc675606a8 Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Thu, 13 Jun 2013 01:46:35 -0700 Subject: [PATCH] Always override validator param docs with specific instance docs. --- r2/r2/lib/validator/validator.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/r2/r2/lib/validator/validator.py b/r2/r2/lib/validator/validator.py index 0cdd3ee09..d3cba457f 100644 --- a/r2/r2/lib/validator/validator.py +++ b/r2/r2/lib/validator/validator.py @@ -105,8 +105,6 @@ class Validator(object): param_info = {} for param in filter(None, tup(self.param)): param_info[param] = None - if self.docs: - param_info.update(self.docs) return param_info def __call__(self, url): @@ -164,7 +162,10 @@ def set_api_docs(fn, simple_vals, param_vals, extra_vals=None): doc = fn._api_doc = getattr(fn, '_api_doc', {}) param_info = doc.get('parameters', {}) for validator in chain(simple_vals, param_vals.itervalues()): - param_info.update(validator.param_docs()) + param_docs = validator.param_docs() + if validator.docs: + param_docs.update(validator.docs) + param_info.update(param_docs) if extra_vals: param_info.update(extra_vals) doc['parameters'] = param_info