summaryrefslogtreecommitdiff
path: root/testlib.py
diff options
context:
space:
mode:
authorSylvain Th?nault <sylvain.thenault@logilab.fr>2012-07-17 15:39:28 +0200
committerSylvain Th?nault <sylvain.thenault@logilab.fr>2012-07-17 15:39:28 +0200
commit20095a78b5a71d9346f0ed7cd9638288521436c8 (patch)
tree87aff36d08c1c95399724971dfb5ad605ac75104 /testlib.py
parent8139f6b6856ed634b7fb3a8a866ddeca1d0c99b1 (diff)
downloadlogilab-common-20095a78b5a71d9346f0ed7cd9638288521436c8.tar.gz
Adapt testlib.py in order to be compatible with Jython which doesn't have a __builtins__ module. Closes #99627.
Diffstat (limited to 'testlib.py')
-rw-r--r--testlib.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/testlib.py b/testlib.py
index a35ad98..41ffb5f 100644
--- a/testlib.py
+++ b/testlib.py
@@ -53,9 +53,11 @@ import warnings
from shutil import rmtree
from operator import itemgetter
from ConfigParser import ConfigParser
-from logilab.common.deprecation import deprecated
from itertools import dropwhile
+from logilab.common.deprecation import deprecated
+from logilab.common.compat import builtins
+
import unittest as unittest_legacy
if not getattr(unittest_legacy, "__package__", None):
try:
@@ -950,7 +952,7 @@ succeeded test into", osp.join(os.getcwd(), FILE_RESTART)
def assertTextEquals(self, text1, text2, junk=None,
msg_prefix='Text differ', striplines=False):
"""compare two multiline strings (using difflib and splitlines())
-
+
:param text1: a Python BaseString
:param text2: a second Python Basestring
:param junk: List of Caracters
@@ -1216,12 +1218,12 @@ class DocTest(TestCase):
suite = SkippedSuite()
# doctest may gork the builtins dictionnary
# This happen to the "_" entry used by gettext
- old_builtins = __builtins__.copy()
+ old_builtins = builtins.__dict__.copy()
try:
return suite.run(result)
finally:
- __builtins__.clear()
- __builtins__.update(old_builtins)
+ builtins.__dict__.clear()
+ builtins.__dict__.update(old_builtins)
run = __call__
def test(self):