[pypy-svn] r33971 - in pypy/dist/pypy/jit/timeshifter: . test

[arigo at codespeak.net]

Author: arigo
Date: Tue Oct 31 17:57:58 2006
New Revision: 33971

Added:
   pypy/dist/pypy/jit/timeshifter/hrtyper.py
      - copied unchanged from r33969, pypy/dist/pypy/jit/timeshifter/rtyper.py
Removed:
   pypy/dist/pypy/jit/timeshifter/rtyper.py
Modified:
   pypy/dist/pypy/jit/timeshifter/test/test_portal.py
   pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py
Log:
Rename jit/timeshifter/rtyper.py to a name that doesn't conflict with both rpython/rtyper.py
and timeshifter/rtimeshift.py (for completion).


Modified: pypy/dist/pypy/jit/timeshifter/test/test_portal.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/test/test_portal.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/test/test_portal.py	Tue Oct 31 17:57:58 2006
@@ -1,7 +1,7 @@
 from pypy import conftest
 from pypy.translator.translator import graphof
 from pypy.jit.timeshifter.test.test_timeshift import hannotate
-from pypy.jit.timeshifter.rtyper import HintRTyper
+from pypy.jit.timeshifter.hrtyper import HintRTyper
 from pypy.jit.timeshifter.test.test_timeshift import P_NOVIRTUAL
 from pypy.rpython.llinterp import LLInterpreter
 from pypy.objspace.flow.model import checkgraph, summary

Modified: pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py	Tue Oct 31 17:57:58 2006
@@ -3,8 +3,8 @@
 from pypy.jit.hintannotator.annotator import HintAnnotator
 from pypy.jit.hintannotator.bookkeeper import HintBookkeeper
 from pypy.jit.hintannotator.model import *
-from pypy.jit.timeshifter.rtyper import HintRTyper, originalconcretetype
-from pypy.jit.timeshifter import rtimeshift, rvalue, rtyper as hintrtyper
+from pypy.jit.timeshifter.hrtyper import HintRTyper, originalconcretetype
+from pypy.jit.timeshifter import rtimeshift, rvalue
 from pypy.objspace.flow.model import summary
 from pypy.rpython.lltypesystem import lltype, llmemory, rstr
 from pypy.rpython.objectmodel import hint, keepalive_until_here