Merge pull request #165 from seperman/dev

v4-0-9: Fixing the bug for hashing custom unhashable objects

Author: seperman

.travis.yml

@@ -7,6 +7,7 @@ matrix:
     - python: 3.6
     - python: pypy3
     - python: 3.7
+    - python: 3.8
       dist: xenial
       sudo: true
 

README.md

@@ -1,4 +1,4 @@
-# DeepDiff v 4.0.8
+# DeepDiff v 4.0.9
 
 <!-- ![Downloads](https://img.shields.io/pypi/dm/deepdiff.svg?style=flat) -->
 ![Python Versions](https://img.shields.io/pypi/pyversions/deepdiff.svg?style=flat)
@@ -417,6 +417,7 @@ And then running
 
 # ChangeLog
 
+- v4-0-9: Fixing the bug for hashing custom unhashable objects
 - v4-0-8: Adding ignore_nan_inequality for float('nan')
 - v4-0-7: Hashing of the number 1 vs. True
 - v4-0-6: found a tiny bug in Python formatting of numbers in scientific notation. Added a workaround.

deepdiff/__init__.py

@@ -1,6 +1,6 @@
 """This module offers the DeepDiff, DeepSearch, grep and DeepHash classes."""
 # flake8: noqa
-__version__ = '4.0.8'
+__version__ = '4.0.9'
 import logging
 
 if __name__ == '__main__':

deepdiff/deephash.py

@@ -326,7 +326,7 @@ def _hash(self, obj, parent, parents_ids=EMPTY_FROZENSET):
         elif isinstance(obj, Iterable):
             result = self._prep_iterable(obj=obj, parent=parent, parents_ids=parents_ids)
 
-        elif obj in {BoolObj.TRUE, BoolObj.FALSE}:
+        elif obj == BoolObj.TRUE or obj == BoolObj.FALSE:
             result = 'bool:true' if obj is BoolObj.TRUE else 'bool:false'
         else:
             result = self._prep_obj(obj=obj, parent=parent, parents_ids=parents_ids)

deepdiff/diff.py

@@ -478,9 +478,9 @@ def __create_hashtable(self, t, level):
                                       )
                 item_hash = hashes_all[item]
             except Exception as e:  # pragma: no cover
-                logger.warning("Can not produce a hash for %s."
-                               "Not counting this object.\n %s" %
-                               (level.path(), e))
+                logger.error("Can not produce a hash for %s."
+                             "Not counting this object.\n %s" %
+                             (level.path(), e))
             else:
                 if item_hash is unprocessed:  # pragma: no cover
                     logger.warning("Item %s was not processed while hashing "

docs/conf.py

@@ -60,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.8'
+version = '4.0.9'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.8'
+release = '4.0.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst

@@ -4,7 +4,7 @@
    contain the root `toctree` directive.
 
 
-DeepDiff 4.0.8 documentation!
+DeepDiff 4.0.9 documentation!
 =============================
 
 **DeepDiff: Deep Difference of dictionaries, iterables, strings and other objects. It will recursively look for all the changes.**
@@ -281,6 +281,7 @@ Indices and tables
 Changelog
 =========
 
+- v4-0-9: Fixing the bug for hashing custom unhashable objects
 - v4-0-8: Adding ignore_nan_inequality for float('nan')
 - v4-0-7: Hashing of the number 1 vs. True
 - v4-0-6: found a tiny bug in Python formatting of numbers in scientific notation. Added a workaround.

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.0.8
+current_version = 4.0.9
 commit = True
 tag = True
 tag_name = {new_version}

setup.py

@@ -10,7 +10,7 @@
 if os.environ.get('USER', '') == 'vagrant':
     del os.link
 
-version = '4.0.8'
+version = '4.0.9'
 
 
 def get_reqs(filename):

tests/__init__.py

@@ -16,3 +16,12 @@ def __repr__(self):
 class CustomClassMisleadingRepr(CustomClass):
     def __str__(self):
         return "({}, {})".format(self.a, self.b)
+
+
+class CustomClass2:
+    def __init__(self, prop1=None, prop2=None):
+        self.prop1 = prop1 or []
+        self.prop2 = prop2 or []
+
+    def __eq__(self, other):
+        return self.__dict__ == other.__dict__