Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #5442 -- Added Jython workaround in django.test._doctest. Thank…

…s, leo.soto@gmail.com

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 933cda3749865b0c776a21b39076c500ddcbe12f 1 parent 42f4f44
@adrianholovaty adrianholovaty authored
Showing with 9 additions and 1 deletion.
  1. +9 −1 django/test/_doctest.py
View
10 django/test/_doctest.py
@@ -1,5 +1,5 @@
# This is a slightly modified version of the doctest.py that shipped with Python 2.4
-# It incorporates changes that have been submitted the the Python ticket tracker
+# It incorporates changes that have been submitted the the Python ticket tracker
# as ticket #1521051. These changes allow for a DoctestRunner and Doctest base
# class to be specified when constructing a DoctestSuite.
@@ -105,6 +105,14 @@ def _test():
import warnings
from StringIO import StringIO
+if sys.platform.startswith('java'):
+ # On Jython, isclass() reports some modules as classes. Patch it.
+ def patch_isclass(isclass):
+ def patched_isclass(obj):
+ return isclass(obj) and hasattr(obj, '__module__')
+ return patched_isclass
+ inspect.isclass = patch_isclass(inspect.isclass)
+
# Don't whine about the deprecated is_private function in this
# module's tests.
warnings.filterwarnings("ignore", "is_private", DeprecationWarning,

0 comments on commit 933cda3

Please sign in to comment.
Something went wrong with that request. Please try again.