Resolve option conflict differently.

pull/8465/head
Michael DeHaan 12 years ago
parent f24e335d0f
commit 1c6398dd3b

@ -85,9 +85,7 @@ def get_docstring(filename, verbose=False):
if not doc.has_key(key):
doc[key] = value
else:
# not sure this is the only example but don't do this for the copy module
if key != 'force':
doc[key].update(value)
doc[key].update(value)
if 'EXAMPLES' in (t.id for t in child.targets):
plainexamples = child.value.s[1:] # Skip first empty line

Loading…
Cancel
Save