From: Skip Montanaro <skip@pobox.com>
Date: Wed, 19 Nov 2008 03:35:41 +0000 (+0000)
Subject: patch from issue 1108
X-Git-Tag: v2.7a1~2653
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fb29797e3b53fdb73155d269f210a3da7d725d6;p=thirdparty%2FPython%2Fcpython.git

patch from issue 1108
---

diff --git a/Lib/doctest.py b/Lib/doctest.py
index 8806d6e7f84d..8a5a22c1ca89 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -854,12 +854,12 @@ class DocTestFinder:
         """
         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):