[pypy-commit] pypy extregistry-refactor: Don't pass unnecessary params to public extregistry functions
rlamy
noreply at buildbot.pypy.org
Tue Mar 12 22:48:33 CET 2013
Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: extregistry-refactor
Changeset: r62322:c87052ea1606
Date: 2013-03-11 20:37 +0000
http://bitbucket.org/pypy/pypy/changeset/c87052ea1606/
Log: Don't pass unnecessary params to public extregistry functions
diff --git a/rpython/annotator/bookkeeper.py b/rpython/annotator/bookkeeper.py
--- a/rpython/annotator/bookkeeper.py
+++ b/rpython/annotator/bookkeeper.py
@@ -426,8 +426,8 @@
elif ishashable(x) and x in BUILTIN_ANALYZERS:
_module = getattr(x,"__module__","unknown")
result = SomeBuiltin(BUILTIN_ANALYZERS[x], methodname="%s.%s" % (_module, x.__name__))
- elif extregistry.is_registered(x, self.policy):
- entry = extregistry.lookup(x, self.policy)
+ elif extregistry.is_registered(x):
+ entry = extregistry.lookup(x)
result = entry.compute_annotation_bk(self)
elif isinstance(x, lltype._ptr):
result = SomePtr(lltype.typeOf(x))
diff --git a/rpython/annotator/signature.py b/rpython/annotator/signature.py
--- a/rpython/annotator/signature.py
+++ b/rpython/annotator/signature.py
@@ -82,8 +82,8 @@
return SomeUnicodeString()
elif t is types.NoneType:
return s_None
- elif bookkeeper and extregistry.is_registered_type(t, bookkeeper.policy):
- entry = extregistry.lookup_type(t, bookkeeper.policy)
+ elif bookkeeper and extregistry.is_registered_type(t):
+ entry = extregistry.lookup_type(t)
return entry.compute_annotation_bk(bookkeeper)
elif t is type:
return SomeType()
@@ -97,7 +97,7 @@
def __init__(self, *argtypes):
self.argtypes = argtypes
-
+
def __call__(self, funcdesc, inputcells):
from rpython.rtyper.lltypesystem import lltype
args_s = []
diff --git a/rpython/rtyper/extregistry.py b/rpython/rtyper/extregistry.py
--- a/rpython/rtyper/extregistry.py
+++ b/rpython/rtyper/extregistry.py
@@ -131,11 +131,11 @@
except (KeyError, TypeError):
return EXT_REGISTRY_BY_METATYPE[type(tp)]
-def lookup_type(tp, _ignored=None):
+def lookup_type(tp):
Entry = _lookup_type_cls(tp)
return Entry(tp)
-def is_registered_type(tp, _ignored=None):
+def is_registered_type(tp):
try:
_lookup_type_cls(tp)
except KeyError:
@@ -148,11 +148,11 @@
except (KeyError, TypeError):
return _lookup_type_cls(type(instance))
-def lookup(instance, _ignored=None):
+def lookup(instance):
Entry = _lookup_cls(instance)
return Entry(type(instance), instance)
-def is_registered(instance, _ignored=None):
+def is_registered(instance):
try:
_lookup_cls(instance)
except KeyError:
More information about the pypy-commit
mailing list