[pypy-svn] r75982 - in pypy/branch/rsre2/pypy/rlib/rsre_jit: . test

[arigo at codespeak.net]

Author: arigo
Date: Wed Jul  7 17:15:40 2010
New Revision: 75982

Modified:
   pypy/branch/rsre2/pypy/rlib/rsre_jit/rsre.py
   pypy/branch/rsre2/pypy/rlib/rsre_jit/test/targetrsre.py
   pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_match.py
   pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_more.py
   pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_search.py
   pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_zexternal.py
Log:
Fix imports.


Modified: pypy/branch/rsre2/pypy/rlib/rsre_jit/rsre.py
==============================================================================
--- pypy/branch/rsre2/pypy/rlib/rsre_jit/rsre.py	(original)
+++ pypy/branch/rsre2/pypy/rlib/rsre_jit/rsre.py	Wed Jul  7 17:15:40 2010
@@ -1,5 +1,5 @@
 from pypy.rlib.debug import check_nonneg
-from pypy.rlib.rsre import rsre_char
+from pypy.rlib.rsre_jit import rsre_char
 
 
 OPCODE_FAILURE            = 0

Modified: pypy/branch/rsre2/pypy/rlib/rsre_jit/test/targetrsre.py
==============================================================================
--- pypy/branch/rsre2/pypy/rlib/rsre_jit/test/targetrsre.py	(original)
+++ pypy/branch/rsre2/pypy/rlib/rsre_jit/test/targetrsre.py	Wed Jul  7 17:15:40 2010
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from pypy.rlib.rarithmetic import intmask
-from pypy.rlib.rsre import rsre
+from pypy.rlib.rsre_jit import rsre
 import os, time
 
 

Modified: pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_match.py
==============================================================================
--- pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_match.py	(original)
+++ pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_match.py	Wed Jul  7 17:15:40 2010
@@ -1,5 +1,5 @@
 import _sre, re, sre_compile
-from pypy.rlib.rsre import rsre
+from pypy.rlib.rsre_jit import rsre
 
 
 def get_code(regexp):

Modified: pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_more.py
==============================================================================
--- pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_more.py	(original)
+++ pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_more.py	Wed Jul  7 17:15:40 2010
@@ -1,5 +1,5 @@
-from pypy.rlib.rsre import rsre
-from pypy.rlib.rsre.test.test_match import get_code, get_code_and_re
+from pypy.rlib.rsre_jit import rsre
+from pypy.rlib.rsre_jit.test.test_match import get_code, get_code_and_re
 
 
 class TestSearch:

Modified: pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_search.py
==============================================================================
--- pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_search.py	(original)
+++ pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_search.py	Wed Jul  7 17:15:40 2010
@@ -1,5 +1,5 @@
-from pypy.rlib.rsre import rsre
-from pypy.rlib.rsre.test.test_match import get_code
+from pypy.rlib.rsre_jit import rsre
+from pypy.rlib.rsre_jit.test.test_match import get_code
 
 
 class TestSearch:

Modified: pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_zexternal.py
==============================================================================
--- pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_zexternal.py	(original)
+++ pypy/branch/rsre2/pypy/rlib/rsre_jit/test/test_zexternal.py	Wed Jul  7 17:15:40 2010
@@ -1,20 +1,20 @@
 import re
-from pypy.rlib.rsre.test.test_match import get_code
-from pypy.rlib.rsre import rsre
+from pypy.rlib.rsre_jit.test.test_match import get_code
+from pypy.rlib.rsre_jit import rsre
 
 
 def test_external_match():
-    from pypy.rlib.rsre.test.re_tests import tests
+    from pypy.rlib.rsre_jit.test.re_tests import tests
     for t in tests:
         yield run_external, t, False
 
 def test_external_search():
-    from pypy.rlib.rsre.test.re_tests import tests
+    from pypy.rlib.rsre_jit.test.re_tests import tests
     for t in tests:
         yield run_external, t, True
 
 def run_external(t, use_search):
-    from pypy.rlib.rsre.test.re_tests import SUCCEED, FAIL, SYNTAX_ERROR
+    from pypy.rlib.rsre_jit.test.re_tests import SUCCEED, FAIL, SYNTAX_ERROR
     pattern, s, outcome = t[:3]
     if len(t) == 5:
         repl, expected = t[3:5]