Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r70078:0f937ae8b835
Date: 2014-03-18 20:08 -0700
http://bitbucket.org/pypy/pypy/changeset/0f937ae8b835/
Log: kill __builtin__.buffer, adjust test
diff --git a/pypy/module/__builtin__/test/test_builtin.py
b/pypy/module/__builtin__/test/test_builtin.py
--- a/pypy/module/__builtin__/test/test_builtin.py
+++ b/pypy/module/__builtin__/test/test_builtin.py
@@ -26,15 +26,11 @@
cls.w_safe_runtimerror = cls.space.wrap(sys.version_info < (2, 6))
def test_builtin_names(self):
- import __builtin__
- assert __builtin__.None is None
- assert __builtin__.False is False
- assert __builtin__.True is True
-
- assert __builtin__.buffer is buffer
- assert __builtin__.bytes is str
+ import builtins as __builtin__
+ assert __builtin__.bytes is bytes
assert __builtin__.dict is dict
assert __builtin__.memoryview is memoryview
+ assert not hasattr(__builtin__, 'buffer')
def test_bytes_alias(self):
assert bytes is not str
diff --git a/pypy/objspace/std/model.py b/pypy/objspace/std/model.py
--- a/pypy/objspace/std/model.py
+++ b/pypy/objspace/std/model.py
@@ -61,7 +61,7 @@
from pypy.objspace.std import unicodeobject
from pypy.objspace.std import dictproxyobject
from pypy.objspace.std import proxyobject
- from pypy.objspace.std.memoryview import W_Buffer, W_MemoryView
+ from pypy.objspace.std.memoryview import W_MemoryView
import pypy.objspace.std.default # register a few catch-all
multimethods
import pypy.objspace.std.marshal_impl # install marshal multimethods
@@ -80,7 +80,6 @@
self.pythontypes.append(intobject.W_IntObject.typedef)
self.pythontypes.append(boolobject.W_BoolObject.typedef)
self.pythontypes.append(longobject.W_LongObject.typedef)
- self.pythontypes.append(W_Buffer.typedef)
self.pythontypes.append(W_MemoryView.typedef)
# the set of implementation types
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
