[Python-checkins] r67277 - python/trunk/Lib/doctest.py

[skip.montanaro]

Author: skip.montanaro
Date: Wed Nov 19 04:35:41 2008
New Revision: 67277

Log:
patch from issue 1108

Modified:
   python/trunk/Lib/doctest.py

Modified: python/trunk/Lib/doctest.py
==============================================================================
--- python/trunk/Lib/doctest.py	(original)
+++ python/trunk/Lib/doctest.py	Wed Nov 19 04:35:41 2008
@@ -854,12 +854,12 @@
         """
         if module is None:
             return True
+        elif inspect.getmodule(object) is not None:
+            return module is inspect.getmodule(object)
         elif inspect.isfunction(object):
             return module.__dict__ is object.func_globals
         elif inspect.isclass(object):
             return module.__name__ == object.__module__
-        elif inspect.getmodule(object) is not None:
-            return module is inspect.getmodule(object)
         elif hasattr(object, '__module__'):
             return module.__name__ == object.__module__
         elif isinstance(object, property):