[pypy-commit] pypy default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r61617:306c896faeb1
Date: 2013-02-22 18:22 +0200
http://bitbucket.org/pypy/pypy/changeset/306c896faeb1/

Log:	merge

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -68,3 +68,6 @@
 
 .. branch: coding-guide-update-rlib-refs
 .. branch: rlib-doc-rpython-refs
+
+.. branch: enumerate-rstr
+Support enumerate() over rstr types.
diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -861,6 +861,7 @@
     peek = interp2app(W_BufferedReader.peek_w),
     read1 = interp2app(W_BufferedReader.read1_w),
     raw = interp_attrproperty_w("w_raw", cls=W_BufferedReader),
+    readline = interp2app(W_BufferedReader.readline_w),
 
     # from the mixin class
     __repr__ = interp2app(W_BufferedReader.repr_w),
diff --git a/rpython/rtyper/ootypesystem/rlist.py b/rpython/rtyper/ootypesystem/rlist.py
--- a/rpython/rtyper/ootypesystem/rlist.py
+++ b/rpython/rtyper/ootypesystem/rlist.py
@@ -241,6 +241,7 @@
 
     def __init__(self, r_list):
         self.r_list = r_list
+        self.external_item_repr = r_list.external_item_repr
         self.lowleveltype = ootype.Record(
                 {"iterable": r_list.lowleveltype, "index": ootype.Signed})
         self.ll_listiter = ll_listiter
diff --git a/rpython/rtyper/ootypesystem/rstr.py b/rpython/rtyper/ootypesystem/rstr.py
--- a/rpython/rtyper/ootypesystem/rstr.py
+++ b/rpython/rtyper/ootypesystem/rstr.py
@@ -445,6 +445,7 @@
     def __init__(self):
         self.ll_striter = ll_unicodeiter
         self.ll_strnext = ll_strnext
+        self.ll_getnextindex = ll_getnextindex
 
 def ll_striter(string):
     iter = ootype.new(string_repr.string_iterator_repr.lowleveltype)