Browse code

Resolve option conflict differently.

Michael DeHaan authored on 2014/08/06 09:40:01
Showing 1 changed files
... ...
@@ -85,9 +85,7 @@ def get_docstring(filename, verbose=False):
85 85
                             if not doc.has_key(key):
86 86
                                 doc[key] = value
87 87
                             else:
88
-                                # not sure this is the only example but don't do this for the copy module
89
-                                if key != 'force':
90
-                                    doc[key].update(value)
88
+                                doc[key].update(value)
91 89
 
92 90
                 if 'EXAMPLES' in (t.id for t in child.targets):
93 91
                     plainexamples = child.value.s[1:]  # Skip first empty line