[Checkins] SVN: Sandbox/J1m/customdoctests/s make spidermonkey optional

Jim Fulton jim at zope.com
Tue Apr 5 14:45:24 EDT 2011


Log message for revision 121288:
  make spidermonkey optional

Changed:
  U   Sandbox/J1m/customdoctests/setup.py
  U   Sandbox/J1m/customdoctests/src/zc/customdoctests/js.py

-=-
Modified: Sandbox/J1m/customdoctests/setup.py
===================================================================
--- Sandbox/J1m/customdoctests/setup.py	2011-04-05 16:14:19 UTC (rev 121287)
+++ Sandbox/J1m/customdoctests/setup.py	2011-04-05 18:45:24 UTC (rev 121288)
@@ -13,7 +13,7 @@
 ##############################################################################
 name, version = 'zc.customdoctests', '0'
 
-install_requires = ['setuptools', 'python-spidermonkey']
+install_requires = ['setuptools']
 extras_require = dict(test=['zope.testing'])
 
 entry_points = """

Modified: Sandbox/J1m/customdoctests/src/zc/customdoctests/js.py
===================================================================
--- Sandbox/J1m/customdoctests/src/zc/customdoctests/js.py	2011-04-05 16:14:19 UTC (rev 121287)
+++ Sandbox/J1m/customdoctests/src/zc/customdoctests/js.py	2011-04-05 18:45:24 UTC (rev 121288)
@@ -15,7 +15,6 @@
 import doctest
 import os
 import re
-import spidermonkey
 import sys
 import zc.customdoctests
 
@@ -36,6 +35,9 @@
     ps1='js!', comment_prefix='//',
     transform=lambda s: transform(s, 'JS_'))
 
+
+# spidermonkey hacks below:
+
 class JavaScriptError(Exception):
 
     def __str__(self):
@@ -64,9 +66,10 @@
         if self.spidermonkey_error is not None:
             raise JavaScriptError(self.spidermonkey_error)
 
-def setUp(test_or_self=None):
+def spidermonkeySetUp(test_or_self=None):
     global run_time
     if run_time is None:
+        import spidermonkey
         run_time = spidermonkey.Runtime()
     cx = run_time.new_context()
     JS = cx.execute



More information about the checkins mailing list