Author: Ronan Lamy <[email protected]>
Branch: extregistry-refactor
Changeset: r62293:d237feec99cf
Date: 2013-03-11 16:22 +0000
http://bitbucket.org/pypy/pypy/changeset/d237feec99cf/

Log:    kill unused ClassFamily.conditionals

diff --git a/rpython/rtyper/extregistry.py b/rpython/rtyper/extregistry.py
--- a/rpython/rtyper/extregistry.py
+++ b/rpython/rtyper/extregistry.py
@@ -41,24 +41,13 @@
 
     def __init__(self):
         self.default = None
-        self.conditionals = []
 
     def add(self, cls, cond=None):
-        if cond is None:
-            assert self.default is None, (
-                "duplicate extregistry entry %r" % (cls,))
-            self.default = cls
-        else:
-            self.conditionals.append((cls, cond))
+        assert self.default is None, (
+            "duplicate extregistry entry %r" % (cls,))
+        self.default = cls
 
     def match(self, config):
-        if config is not None:
-            matches = [cls for cls, cond in self.conditionals
-                           if cond(config)]
-            if matches:
-                assert len(matches) == 1, (
-                    "multiple extregistry matches: %r" % (matches,))
-                return matches[0]
         if self.default:
             return self.default
         raise KeyError("no default extregistry entry")
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to