SF patch 672098: Three __contains__ implementations

Contributed by Jp Calderone.

diff --git a/Lib/lib-tk/Canvas.py b/Lib/lib-tk/Canvas.py
index ed4ba348cc49163e75e24058b2af90d6bd817875..ae2ced1801e413b42666af6d88fe965574aecc42 100644 (file)
--- a/Lib/lib-tk/Canvas.py
+++ b/Lib/lib-tk/Canvas.py
@@ -39,6 +39,8 @@ class CanvasItem:
         return self._keys
     def has_key(self, key):
         return key in self.keys()
+    def __contains__(self, key):
+        return key in self.keys()
     def addtag(self, tag, option='withtag'):
         self.canvas.addtag(tag, option, self.id)
     def bbox(self):

diff --git a/Lib/plat-riscos/riscosenviron.py b/Lib/plat-riscos/riscosenviron.py
index d92aa31722d9d22d2c5265a2b307cf1a992ffeb1..95a2ce55d992a7dceb6ee22829d188f98fc7b6a6 100644 (file)
--- a/Lib/plat-riscos/riscosenviron.py
+++ b/Lib/plat-riscos/riscosenviron.py
@@ -32,6 +32,8 @@ class _Environ:
     def has_key(self, key):
         value = riscos.getenv(key)
         return value<>None
+    def __contains__(self, key):
+        return riscos.getenv(key) is not None
     def update(self, dict):
         for k, v in dict.items():
             riscos.putenv(k, v)

diff --git a/Lib/xml/sax/xmlreader.py b/Lib/xml/sax/xmlreader.py
index f1c9d9db2ed26a6abc9b9ee307a64fbcd86d7169..9a2361e349d0a33b50cc06c80ededa2b3c4e5947 100644 (file)
--- a/Lib/xml/sax/xmlreader.py
+++ b/Lib/xml/sax/xmlreader.py
@@ -321,6 +321,9 @@ class AttributesImpl:
     def has_key(self, name):
         return self._attrs.has_key(name)
 
+    def __contains__(self, name):
+        return self._attrs.has_key(name)
+
     def get(self, name, alternative=None):
         return self._attrs.get(name, alternative)