[pypy-svn] r8347 - pypy/branch/src-typedunwrap/pypy/objspace/std

[pedronis at codespeak.net]

Author: pedronis
Date: Mon Jan 17 19:33:01 2005
New Revision: 8347

Modified:
   pypy/branch/src-typedunwrap/pypy/objspace/std/objspace.py
   pypy/branch/src-typedunwrap/pypy/objspace/std/slicetype.py
Log:
more type specific unwraps



Modified: pypy/branch/src-typedunwrap/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/branch/src-typedunwrap/pypy/objspace/std/objspace.py	(original)
+++ pypy/branch/src-typedunwrap/pypy/objspace/std/objspace.py	Mon Jan 17 19:33:01 2005
@@ -288,7 +288,7 @@
 
     def newstring(self, chars_w):
         try:
-            chars = [chr(self.unwrap(w_c)) for w_c in chars_w]
+            chars = [chr(self.int_w(w_c)) for w_c in chars_w]
         except TypeError:   # chr(not-an-integer)
             raise OperationError(self.w_TypeError,
                                  self.wrap("an integer is required"))

Modified: pypy/branch/src-typedunwrap/pypy/objspace/std/slicetype.py
==============================================================================
--- pypy/branch/src-typedunwrap/pypy/objspace/std/slicetype.py	(original)
+++ pypy/branch/src-typedunwrap/pypy/objspace/std/slicetype.py	Mon Jan 17 19:33:01 2005
@@ -68,13 +68,13 @@
 def indices3(space, w_slice, length):
     w_result = slice_indices3(space, w_slice, space.wrap(length))
     w_1, w_2, w_3 = space.unpacktuple(w_result, 3)
-    return space.unwrap(w_1), space.unwrap(w_2), space.unwrap(w_3)
+    return space.int_w(w_1), space.int_w(w_2), space.int_w(w_3)
 
 def indices4(space, w_slice, length):
     w_result = slice_indices4(space, w_slice, space.wrap(length))
     w_1, w_2, w_3, w_4 = space.unpacktuple(w_result, 4)
-    return (space.unwrap(w_1), space.unwrap(w_2),
-            space.unwrap(w_3), space.unwrap(w_4))
+    return (space.int_w(w_1), space.int_w(w_2),
+            space.int_w(w_3), space.int_w(w_4))
 
 register_all(vars(), globals())