[pypy-svn] r33976 - in pypy/dist/pypy: annotation rlib rlib/test rpython rpython/test translator/js translator/js/test translator/transformer/test

cfbolz at codespeak.net cfbolz at codespeak.net
Tue Oct 31 18:39:28 CET 2006


Author: cfbolz
Date: Tue Oct 31 18:39:23 2006
New Revision: 33976

Added:
   pypy/dist/pypy/rlib/nonconst.py
      - copied unchanged from r33971, pypy/dist/pypy/rpython/nonconst.py
   pypy/dist/pypy/rlib/test/test_nonconst.py
      - copied, changed from r33971, pypy/dist/pypy/rpython/test/test_nonconst.py
Removed:
   pypy/dist/pypy/rpython/nonconst.py
   pypy/dist/pypy/rpython/test/test_nonconst.py
Modified:
   pypy/dist/pypy/annotation/annrpython.py
   pypy/dist/pypy/translator/js/main.py
   pypy/dist/pypy/translator/js/test/test_transformer.py
   pypy/dist/pypy/translator/transformer/test/test_basictransform.py
Log:
move nonconst


Modified: pypy/dist/pypy/annotation/annrpython.py
==============================================================================
--- pypy/dist/pypy/annotation/annrpython.py	(original)
+++ pypy/dist/pypy/annotation/annrpython.py	Tue Oct 31 18:39:23 2006
@@ -23,7 +23,7 @@
     def __init__(self, translator=None, policy=None, bookkeeper=None):
         import pypy.rpython.ootypesystem.ooregistry # has side effects
         import pypy.rpython.ootypesystem.bltregistry # has side effects
-        import pypy.rpython.nonconst # has side effects
+        import pypy.rlib.nonconst # has side effects
         
         if translator is None:
             # interface for tests

Modified: pypy/dist/pypy/translator/js/main.py
==============================================================================
--- pypy/dist/pypy/translator/js/main.py	(original)
+++ pypy/dist/pypy/translator/js/main.py	Tue Oct 31 18:39:23 2006
@@ -8,7 +8,7 @@
 from pypy.translator.driver import TranslationDriver
 from pypy.translator.js.js import JS
 from pypy.tool.error import AnnotatorError, FlowingError, debug
-from pypy.rpython.nonconst import NonConstant
+from pypy.rlib.nonconst import NonConstant
 from pypy.annotation.policy import AnnotatorPolicy
 from py.compat import optparse
 import py
@@ -60,7 +60,7 @@
 import %(module_name)s
 from pypy.translator.js.helper import __show_traceback
 from pypy.translator.transformer.debug import traceback_handler
-from pypy.rpython.nonconst import NonConstant as NonConst
+from pypy.rlib.nonconst import NonConstant as NonConst
 
 %(function_defs)s
 

Modified: pypy/dist/pypy/translator/js/test/test_transformer.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_transformer.py	(original)
+++ pypy/dist/pypy/translator/js/test/test_transformer.py	Tue Oct 31 18:39:23 2006
@@ -5,7 +5,7 @@
 from pypy.translator.js.main import rpython2javascript
 from pypy.translator.js.test.runtest import compile_function
 from pypy.translator.transformer.debug import traceback_handler
-from pypy.rpython.nonconst import NonConstant as NonConst
+from pypy.rlib.nonconst import NonConstant as NonConst
 
 def check_tb(tb_entry_str, callname, args, func, relline):
     tb_entry = tb_entry_str.split(":")

Modified: pypy/dist/pypy/translator/transformer/test/test_basictransform.py
==============================================================================
--- pypy/dist/pypy/translator/transformer/test/test_basictransform.py	(original)
+++ pypy/dist/pypy/translator/transformer/test/test_basictransform.py	Tue Oct 31 18:39:23 2006
@@ -8,7 +8,7 @@
 from pypy.rpython import llinterp
 from pypy.objspace.flow import model
 from pypy.translator.unsimplify import copyvar
-from pypy.rpython.nonconst import NonConstant
+from pypy.rlib.nonconst import NonConstant
 
 import py
 def setup_module(mod):



More information about the Pypy-commit mailing list