[pypy-commit] pypy py3k: merge upstream

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r69773:da301f6d84f4
Date: 2014-03-06 18:35 -0800
http://bitbucket.org/pypy/pypy/changeset/da301f6d84f4/

Log:	merge upstream

diff --git a/lib-python/3/datetime.py b/lib-python/3/datetime.py
--- a/lib-python/3/datetime.py
+++ b/lib-python/3/datetime.py
@@ -1820,6 +1820,8 @@
         return (self._offset, self._name)
 
     def __eq__(self, other):
+        if type(other) != timezone:
+            return False
         return self._offset == other._offset
 
     def __hash__(self):