Commit 1c6398dd by Michael DeHaan

Resolve option conflict differently.

parent f24e335d
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment