[pypy-commit] pypy default: Rename rlib/rarray to rlib/rrawarray to avoid confusion along

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r67596:1f1e196acd0d
Date: 2013-10-25 11:23 +0200
http://bitbucket.org/pypy/pypy/changeset/1f1e196acd0d/

Log:	Rename rlib/rarray to rlib/rrawarray to avoid confusion along the
	lines of "it's an RPython version of the array module!".

diff --git a/pypy/module/_cffi_backend/ctypeprim.py b/pypy/module/_cffi_backend/ctypeprim.py
--- a/pypy/module/_cffi_backend/ctypeprim.py
+++ b/pypy/module/_cffi_backend/ctypeprim.py
@@ -207,7 +207,7 @@
 
     def unpack_list_of_int_items(self, w_cdata):
         if self.size == rffi.sizeof(rffi.LONG):
-            from rpython.rlib.rarray import populate_list_from_raw_array
+            from rpython.rlib.rrawarray import populate_list_from_raw_array
             res = []
             buf = rffi.cast(rffi.LONGP, w_cdata._cdata)
             length = w_cdata.get_array_length()
@@ -223,7 +223,7 @@
         int_list = self.space.listview_int(w_ob)
         if int_list is not None:
             if self.size == rffi.sizeof(rffi.LONG): # fastest path
-                from rpython.rlib.rarray import copy_list_to_raw_array
+                from rpython.rlib.rrawarray import copy_list_to_raw_array
                 cdata = rffi.cast(rffi.LONGP, cdata)
                 copy_list_to_raw_array(int_list, cdata)
             else:
@@ -367,7 +367,7 @@
 
     def unpack_list_of_float_items(self, w_cdata):
         if self.size == rffi.sizeof(rffi.DOUBLE):
-            from rpython.rlib.rarray import populate_list_from_raw_array
+            from rpython.rlib.rrawarray import populate_list_from_raw_array
             res = []
             buf = rffi.cast(rffi.DOUBLEP, w_cdata._cdata)
             length = w_cdata.get_array_length()
@@ -383,7 +383,7 @@
         float_list = self.space.listview_float(w_ob)
         if float_list is not None:
             if self.size == rffi.sizeof(rffi.DOUBLE):   # fastest path
-                from rpython.rlib.rarray import copy_list_to_raw_array
+                from rpython.rlib.rrawarray import copy_list_to_raw_array
                 cdata = rffi.cast(rffi.DOUBLEP, cdata)
                 copy_list_to_raw_array(float_list, cdata)
                 return True
diff --git a/pypy/module/_cffi_backend/test/test_fastpath.py b/pypy/module/_cffi_backend/test/test_fastpath.py
--- a/pypy/module/_cffi_backend/test/test_fastpath.py
+++ b/pypy/module/_cffi_backend/test/test_fastpath.py
@@ -136,19 +136,19 @@
 
     def setup_method(self, meth):
         from pypy.interpreter import gateway
-        from rpython.rlib import rarray
+        from rpython.rlib import rrawarray
         #
         self.count = 0
         def get_count(*args):
             return self.space.wrap(self.count)
         self.w_get_count = self.space.wrap(gateway.interp2app(get_count))
         #
-        original = rarray.populate_list_from_raw_array
+        original = rrawarray.populate_list_from_raw_array
         def populate_list_from_raw_array(*args):
             self.count += 1
             return original(*args)
         self._original = original
-        rarray.populate_list_from_raw_array = populate_list_from_raw_array
+        rrawarray.populate_list_from_raw_array = populate_list_from_raw_array
         #
         original2 = misc.unpack_list_from_raw_array
         def unpack_list_from_raw_array(*args):
@@ -177,8 +177,8 @@
 
 
     def teardown_method(self, meth):
-        from rpython.rlib import rarray
-        rarray.populate_list_from_raw_array = self._original
+        from rpython.rlib import rrawarray
+        rrawarray.populate_list_from_raw_array = self._original
         misc.unpack_list_from_raw_array = self._original2
         misc.unpack_cfloat_list_from_raw_array = self._original3
         misc.unpack_unsigned_list_from_raw_array = self._original4
diff --git a/rpython/rlib/rarray.py b/rpython/rlib/rrawarray.py
rename from rpython/rlib/rarray.py
rename to rpython/rlib/rrawarray.py
--- a/rpython/rlib/rarray.py
+++ b/rpython/rlib/rrawarray.py
@@ -1,5 +1,4 @@
 from rpython.annotator import model as annmodel
-from rpython.annotator.listdef import ListDef
 from rpython.rlib.objectmodel import specialize
 from rpython.rlib import jit
 from rpython.rtyper.lltypesystem import lltype, llmemory
diff --git a/rpython/rlib/test/test_rarray.py b/rpython/rlib/test/test_rrawarray.py
rename from rpython/rlib/test/test_rarray.py
rename to rpython/rlib/test/test_rrawarray.py
--- a/rpython/rlib/test/test_rarray.py
+++ b/rpython/rlib/test/test_rrawarray.py
@@ -1,4 +1,5 @@
-from rpython.rlib.rarray import copy_list_to_raw_array, populate_list_from_raw_array
+from rpython.rlib.rrawarray import copy_list_to_raw_array, \
+                                   populate_list_from_raw_array
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.rtyper.test.tool import BaseRtypingTest