[pypy-commit] pypy default: Use the same internal names for builders on py2 and py3

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r94554:dad86f083d4a
Date: 2018-05-14 04:17 +0100
http://bitbucket.org/pypy/pypy/changeset/dad86f083d4a/

Log:	Use the same internal names for builders on py2 and py3

diff --git a/pypy/module/__pypy__/interp_builders.py b/pypy/module/__pypy__/interp_builders.py
--- a/pypy/module/__pypy__/interp_builders.py
+++ b/pypy/module/__pypy__/interp_builders.py
@@ -6,7 +6,7 @@
 from rpython.tool.sourcetools import func_with_new_name
 
 
-class W_StringBuilder(W_Root):
+class W_BytesBuilder(W_Root):
     def __init__(self, space, size):
         if size < 0:
             self.builder = StringBuilder()
@@ -15,7 +15,7 @@
 
     @unwrap_spec(size=int)
     def descr__new__(space, w_subtype, size=-1):
-        return W_StringBuilder(space, size)
+        return W_BytesBuilder(space, size)
 
     @unwrap_spec(s='bytes')
     def descr_append(self, space, s):
@@ -39,16 +39,17 @@
             raise oefmt(space.w_ValueError, "no length of built builder")
         return space.newint(self.builder.getlength())
 
-W_StringBuilder.typedef = TypeDef("StringBuilder",
+W_BytesBuilder.typedef = TypeDef("StringBuilder",
     __new__ = interp2app(func_with_new_name(
-                                W_StringBuilder.descr__new__.im_func,
-                                'StringBuilder_new')),
-    append = interp2app(W_StringBuilder.descr_append),
-    append_slice = interp2app(W_StringBuilder.descr_append_slice),
-    build = interp2app(W_StringBuilder.descr_build),
-    __len__ = interp2app(W_StringBuilder.descr_len),
+                                W_BytesBuilder.descr__new__.im_func,
+                                'BytesBuilder_new')),
+    append = interp2app(W_BytesBuilder.descr_append),
+    append_slice = interp2app(W_BytesBuilder.descr_append_slice),
+    build = interp2app(W_BytesBuilder.descr_build),
+    __len__ = interp2app(W_BytesBuilder.descr_len),
 )
-W_StringBuilder.typedef.acceptable_as_base_class = False
+W_BytesBuilder.typedef.acceptable_as_base_class = False
+W_StringBuilder = W_BytesBuilder
 
 class W_UnicodeBuilder(W_Root):
     def __init__(self, space, size):