Author: Philip Jenvey <pjen...@underboss.org>
Branch: kill-multimethod
Changeset: r69526:9152b9f48bd0
Date: 2014-02-27 12:08 -0800
http://bitbucket.org/pypy/pypy/changeset/9152b9f48bd0/
Log: kill builtinshortcut remnants
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -257,10 +257,6 @@
BoolOption("optimized_list_getitem",
"special case the 'list[integer]' expressions",
default=False),
- BoolOption("builtinshortcut",
- "a shortcut for operations between built-in types. XXX: "
- "deprecated, not really a shortcut any more.",
- default=False),
BoolOption("getattributeshortcut",
"track types that override __getattribute__",
default=False,
diff --git a/pypy/doc/config/objspace.std.builtinshortcut.txt
b/pypy/doc/config/objspace.std.builtinshortcut.txt
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.builtinshortcut.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-A shortcut speeding up primitive operations between built-in types.
-
-This is a space-time trade-off: at the moment, this option makes a
-translated pypy-c executable bigger by about 1.7 MB. (This can probably
-be improved with careful analysis.)
diff --git a/pypy/module/array/test/test_array.py
b/pypy/module/array/test/test_array.py
--- a/pypy/module/array/test/test_array.py
+++ b/pypy/module/array/test/test_array.py
@@ -1033,9 +1033,3 @@
b = a * 13
assert len(b) == 13
assert str(b[12]) == "-0.0"
-
-
-class AppTestArrayBuiltinShortcut(AppTestArray):
- spaceconfig = AppTestArray.spaceconfig.copy()
- spaceconfig['objspace.std.builtinshortcut'] = True
-
diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -180,7 +180,6 @@
if not space.isinstance_w(w_other, space.w_set):
return space.w_False
- # tested in test_builtinshortcut.py
# XXX do not make new setobject here
w_other_as_set = self._newobj(space, w_other)
return space.wrap(self.equals(w_other_as_set))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
