Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r69735:240dfa51dd8c
Date: 2014-03-05 16:09 -0500
http://bitbucket.org/pypy/pypy/changeset/240dfa51dd8c/
Log: simplify
diff --git a/pypy/interpreter/special.py b/pypy/interpreter/special.py
--- a/pypy/interpreter/special.py
+++ b/pypy/interpreter/special.py
@@ -2,16 +2,10 @@
class Ellipsis(W_Root):
- def __init__(self, space):
- self.space = space
-
- def descr__repr__(self):
- return self.space.wrap('Ellipsis')
+ def descr__repr__(self, space):
+ return space.wrap('Ellipsis')
class NotImplemented(W_Root):
- def __init__(self, space):
- self.space = space
-
- def descr__repr__(self):
- return self.space.wrap('NotImplemented')
+ def descr__repr__(self, space):
+ return space.wrap('NotImplemented')
diff --git a/pypy/module/micronumpy/compile.py
b/pypy/module/micronumpy/compile.py
--- a/pypy/module/micronumpy/compile.py
+++ b/pypy/module/micronumpy/compile.py
@@ -71,8 +71,8 @@
def __init__(self):
"""NOT_RPYTHON"""
self.fromcache = InternalSpaceCache(self).getorbuild
- self.w_Ellipsis = special.Ellipsis(self)
- self.w_NotImplemented = special.NotImplemented(self)
+ self.w_Ellipsis = special.Ellipsis()
+ self.w_NotImplemented = special.NotImplemented()
def _freeze_(self):
return True
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -58,8 +58,8 @@
self.w_None = W_NoneObject.w_None
self.w_False = W_BoolObject.w_False
self.w_True = W_BoolObject.w_True
- self.w_NotImplemented = self.wrap(special.NotImplemented(self))
- self.w_Ellipsis = self.wrap(special.Ellipsis(self))
+ self.w_NotImplemented = self.wrap(special.NotImplemented())
+ self.w_Ellipsis = self.wrap(special.Ellipsis())
# types
self.builtin_types = {}
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
