Changeset 391 for python/trunk/Lib/UserDict.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/UserDict.py (modified) (2 diffs)

python/trunk/Lib/UserDict.py

@@ -14 +14 @@
         else:
             return cmp(self.data, dict)
+    __hash__ = None # Avoid Py3k warning
     def __len__(self): return len(self.data)
     def __getitem__(self, key):
@@ -98 +99 @@
     def has_key(self, key):
         try:
-            value = self[key]
+            self[key]
         except KeyError:
             return False