github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-02-04 19:55:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Always override validator param docs with specific instance docs.

Browse Source
This commit is contained in:
Max Goodman
2013-06-13 01:46:35 -07:00
parent 869885b2db
commit 90c38d9902
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
r2/r2/lib/validator/validator.py
View File

@@ -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