[pypy-svn] r33977 - in pypy/dist/pypy: rlib rpython rpython/module translator/js/modules/test translator/js/test translator/js/tools

cfbolz at codespeak.net cfbolz at codespeak.net
Tue Oct 31 18:41:46 CET 2006


Author: cfbolz
Date: Tue Oct 31 18:41:43 2006
New Revision: 33977

Added:
   pypy/dist/pypy/rlib/rjs.py
      - copied unchanged from r33974, pypy/dist/pypy/rpython/rjs.py
Removed:
   pypy/dist/pypy/rpython/rjs.py
Modified:
   pypy/dist/pypy/rpython/extfunctable.py
   pypy/dist/pypy/rpython/module/ll_js.py
   pypy/dist/pypy/translator/js/modules/test/test_dom.py
   pypy/dist/pypy/translator/js/test/test_jseval.py
   pypy/dist/pypy/translator/js/tools/console.py
Log:
move rjs


Modified: pypy/dist/pypy/rpython/extfunctable.py
==============================================================================
--- pypy/dist/pypy/rpython/extfunctable.py	(original)
+++ pypy/dist/pypy/rpython/extfunctable.py	Tue Oct 31 18:41:43 2006
@@ -301,7 +301,7 @@
 
 # ___________________________________________________________
 # javascript
-from pypy.rpython import rjs
+from pypy.rlib import rjs
 declare(rjs.jseval, str, 'll_js/jseval')
 
 # ___________________________________________________________

Modified: pypy/dist/pypy/rpython/module/ll_js.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_js.py	(original)
+++ pypy/dist/pypy/rpython/module/ll_js.py	Tue Oct 31 18:41:43 2006
@@ -1,4 +1,4 @@
-from pypy.rpython import rjs
+from pypy.rlib import rjs
 
 def ll_js_jseval(s):
     return rjs.jseval(s)

Modified: pypy/dist/pypy/translator/js/modules/test/test_dom.py
==============================================================================
--- pypy/dist/pypy/translator/js/modules/test/test_dom.py	(original)
+++ pypy/dist/pypy/translator/js/modules/test/test_dom.py	Tue Oct 31 18:41:43 2006
@@ -7,7 +7,7 @@
 from pypy.translator.js.modules.dom import Node, get_document, setTimeout, alert
 from pypy.translator.js.modules.xmlhttp import XMLHttpRequest
 from pypy.translator.js import conftest
-#from pypy.rpython.rjs import jseval
+#from pypy.rlib.rjs import jseval
 
 class Mover(object):
     def __init__(self, elem):

Modified: pypy/dist/pypy/translator/js/test/test_jseval.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_jseval.py	(original)
+++ pypy/dist/pypy/translator/js/test/test_jseval.py	Tue Oct 31 18:41:43 2006
@@ -3,7 +3,7 @@
 
 from pypy.translator.js.test.runtest import compile_function
 from pypy.rpython.lltypesystem import lltype 
-from pypy.rpython.rjs import jseval
+from pypy.rlib.rjs import jseval
 from pypy.translator.js import conftest
 
 def jsnative(cmd):

Modified: pypy/dist/pypy/translator/js/tools/console.py
==============================================================================
--- pypy/dist/pypy/translator/js/tools/console.py	(original)
+++ pypy/dist/pypy/translator/js/tools/console.py	Tue Oct 31 18:41:43 2006
@@ -18,7 +18,7 @@
 from pypy.translator.js.modules.bltns import date
 
 from pypy.translator.js.demo.jsdemo.consserv import ConsoleRootInstance, ConsoleRoot
-from pypy.rpython.rjs import jseval
+from pypy.rlib.rjs import jseval
 
 class Console(object):
     def __init__(self):



More information about the Pypy-commit mailing list