Merge pull request #208 from seperman/dev

seperman · web-flow · commit df5f49046b3c · 2020-07-23T11:46:48.000-06:00
v5-0-2: Bug Fix NoneType in ignore type groups
diff --git a/AUTHORS b/AUTHORS
@@ -1,35 +1,33 @@
-Developer:
+Authors:
 
-- Seperman
+Authors in order of the contributions:
 
-And many thanks to the following people for their contributions to DeepDiff!
-
-- Victor Hahn Castell @ Flexoptix for tree view and major contributions.
-- nfvs for Travis-CI setup script.
-- brbsix for initial Py3 porting.
-- WangFenjin for Unicode support.
-- timoilya for comparing list of sets when ignoring order.
-- Bernhard10 for significant digits comparison.
-- b-jazz for PEP257 cleanup, Standardize on full names, fixing line endings.
-- finnhughes for fixing __slots__
-- moloney for Unicode vs. Bytes default
-- serv-inc for adding help(deepdiff)
-- movermeyer for updating docs
-- maxrothman for search in inherited class attributes
-- maxrothman for search for types/objects
-- MartyHub for exclude regex paths
-- sreecodeslayer for DeepSearch match_string
-- Brian Maissy (brianmaissy) for weakref fix, enum tests
-- Bartosz Borowik (boba-2) for Exclude types fix when ignoring order
-- Brian Maissy (brianmaissy) for fixing classes which inherit from classes with slots didn't have all of their slots compared
-- Juan Soler (Soleronline) for adding ignore_type_number
-- mthaddon for adding timedelta diffing support
-- Necrophagos for Hashing of the number 1 vs. True
-- Hugo (hugovk) for fixes for Python 3.10 and dropping support for EOL Python 3.4
-- Andrey Gavrilin (gaal-dev) for hashing classes.
-- Ivan Piskunov (van-ess0) for deprecation warning enhancement.
-- Nathaniel Brown (nathanielobrown) Adds support for datetime.time
-- Michał Karaś (MKaras93) for the pretty view
-- Christian Kothe (chkothe) for the basic support for diffing numpy arrays
-- Timothy (timson) for truncate_datetime
-- d0b3rm4n for bugfix to not apply format to non numbers.
+- [Sep Dehpour (Seperman)](http://www.zepworks.com)
+- [Victor Hahn Castell](http://hahncastell.de) for the tree view and major contributions:
+- [nfvs](https://github.com/nfvs) for Travis-CI setup script.
+- [brbsix](https://github.com/brbsix) for initial Py3 porting.
+- [WangFenjin](https://github.com/WangFenjin) for unicode support.
+- [timoilya](https://github.com/timoilya) for comparing list of sets when ignoring order.
+- [Bernhard10](https://github.com/Bernhard10) for significant digits comparison.
+- [b-jazz](https://github.com/b-jazz) for PEP257 cleanup, Standardize on full names, fixing line endings.
+- [finnhughes](https://github.com/finnhughes) for fixing __slots__
+- [moloney](https://github.com/moloney) for Unicode vs. Bytes default
+- [serv-inc](https://github.com/serv-inc) for adding help(deepdiff)
+- [movermeyer](https://github.com/movermeyer) for updating docs
+- [maxrothman](https://github.com/maxrothman) for search in inherited class attributes
+- [maxrothman](https://github.com/maxrothman) for search for types/objects
+- [MartyHub](https://github.com/MartyHub) for exclude regex paths
+- [sreecodeslayer](https://github.com/sreecodeslayer) for DeepSearch match_string
+- Brian Maissy [brianmaissy](https://github.com/) for weakref fix, enum tests
+- Bartosz Borowik [boba-2](https://github.com/boba-2) for Exclude types fix when ignoring order
+- Brian Maissy [brianmaissy](https://github.com/brianmaissy) for fixing classes which inherit from classes with slots didn't have all of their slots compared
+- Juan Soler [Soleronline](https://github.com/Soleronline) for adding ignore_type_number
+- [mthaddon](https://github.com/mthaddon) for adding timedelta diffing support
+- [Necrophagos](https://github.com/Necrophagos) for Hashing of the number 1 vs. True
+- [gaal-dev](https://github.com/gaal-dev) for adding exclude_obj_callback
+- Ivan Piskunov [van-ess0](https://github.com/van-ess0) for deprecation warning enhancement.
+- Michał Karaś [MKaras93](https://github.com/MKaras93) for the pretty view
+- Christian Kothe [chkothe](https://github.com/chkothe) for the basic support for diffing numpy arrays
+- [Timothy](https://github.com/timson) for truncate_datetime
+- [d0b3rm4n](https://github.com/d0b3rm4n) for bugfix to not apply format to non numbers.
+- [MyrikLD](https://github.com/MyrikLD) for Bug Fix NoneType in ignore type groups
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 DeepDiff Change log
 
+- v5-0-2: Bug Fix NoneType in ignore type groups https://github.com/seperman/deepdiff/issues/207
 - v5-0-1: Bug fix to not apply format to non numbers.
 - v5-0-0: Introducing the Delta object, Improving Numpy support, Fixing tuples comparison when ignore_order=True, Dramatically improving the results when ignore_order=True by running in passes, Introducing pretty print view, deep_distance, purge, progress logging, cache and truncate_datetime.
 - v4-3-3: Adds support for datetime.time
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# DeepDiff v 5.0.1
+# DeepDiff v 5.0.2
 
 ![Downloads](https://img.shields.io/pypi/dm/deepdiff.svg?style=flat)
 ![Python Versions](https://img.shields.io/pypi/pyversions/deepdiff.svg?style=flat)
@@ -17,7 +17,7 @@ Tested on Python 3.5+ and PyPy3.
 **NOTE: Python 2 is not supported any more. DeepDiff v3.3.0 was the last version to support Python 2**
 
 
-- [Documentation](https://zepworks.com/deepdiff/5.0.1/)
+- [Documentation](https://zepworks.com/deepdiff/5.0.2/)
 
 
 ## Installation
@@ -46,13 +46,13 @@ If you are running into trouble installing Murmur3, please take a look at the [T
 
 DeepDiff gets the difference of 2 objects.
 
-> - Please take a look at the [DeepDiff docs](https://zepworks.com/deepdiff/5.0.1/diff.html)
-> - The full documentation can be found on <https://zepworks.com/deepdiff/5.0.1/>
+> - Please take a look at the [DeepDiff docs](https://zepworks.com/deepdiff/5.0.2/diff.html)
+> - The full documentation can be found on <https://zepworks.com/deepdiff/5.0.2/>
 > - Tutorials can be found on <https://zepworks.com/tags/deepdiff/>
 
 ## A few Examples
 
-> Note: This is just a brief overview of what DeepDiff can do. Please visit <https://zepworks.com/deepdiff/5.0.1/> for full documentation.
+> Note: This is just a brief overview of what DeepDiff can do. Please visit <https://zepworks.com/deepdiff/5.0.2/> for full documentation.
 
 ### List difference ignoring order or duplicates
 
@@ -256,8 +256,8 @@ Example:
 ```
 
 
-> - Please take a look at the [DeepDiff docs](https://zepworks.com/deepdiff/5.0.1/diff.html)
-> - The full documentation can be found on <https://zepworks.com/deepdiff/5.0.1/>
+> - Please take a look at the [DeepDiff docs](https://zepworks.com/deepdiff/5.0.2/diff.html)
+> - The full documentation can be found on <https://zepworks.com/deepdiff/5.0.2/>
 
 
 # Deep Search
@@ -289,17 +289,17 @@ And you can pass all the same kwargs as DeepSearch to grep too:
 {'matched_paths': {"root['somewhere']": 'around'}, 'matched_values': {"root['long']": 'somewhere'}}
 ```
 
-> - Please take a look at the [DeepSearch docs](https://zepworks.com/deepdiff/5.0.1/dsearch.html)
-> - The full documentation can be found on <https://zepworks.com/deepdiff/5.0.1/>
+> - Please take a look at the [DeepSearch docs](https://zepworks.com/deepdiff/5.0.2/dsearch.html)
+> - The full documentation can be found on <https://zepworks.com/deepdiff/5.0.2/>
 
 # Deep Hash
 (New in v4-0-0)
 
 DeepHash is designed to give you hash of ANY python object based on its contents even if the object is not considered hashable!
 DeepHash is supposed to be deterministic in order to make sure 2 objects that contain the same data, produce the same hash.
 
-> - Please take a look at the [DeepHash docs](https://zepworks.com/deepdiff/5.0.1/deephash.html)
-> - The full documentation can be found on <https://zepworks.com/deepdiff/5.0.1/>
+> - Please take a look at the [DeepHash docs](https://zepworks.com/deepdiff/5.0.2/deephash.html)
+> - The full documentation can be found on <https://zepworks.com/deepdiff/5.0.2/>
 
 Let's say you have a dictionary object.
 
@@ -347,8 +347,8 @@ Which you can write as:
 At first it might seem weird why DeepHash(obj)[obj] but remember that DeepHash(obj) is a dictionary of hashes of all other objects that obj contains too.
 
 
-> - Please take a look at the [DeepHash docs](https://zepworks.com/deepdiff/5.0.1/deephash.html)
-> - The full documentation can be found on <https://zepworks.com/deepdiff/5.0.1/>
+> - Please take a look at the [DeepHash docs](https://zepworks.com/deepdiff/5.0.2/deephash.html)
+> - The full documentation can be found on <https://zepworks.com/deepdiff/5.0.2/>
 
 
 # Using DeepDiff in unit tests
@@ -443,38 +443,34 @@ Thank you!
 
 # Authors
 
-Developer:
-
-- Seperman (Sep Dehpour)
-    - [Github](https://github.com/seperman)
-    - [Linkedin](http://www.linkedin.com/in/sepehr)
-    - [ZepWorks](http://www.zepworks.com)
-
-And many thanks to the following people for their contributions to DeepDiff!
-
-- Victor Hahn Castell for the tree view and major contributions:
-    - [hahncastell.de](http://hahncastell.de)
-    - [flexoptix.net](http://www.flexoptix.net)
-- nfvs for Travis-CI setup script.
-- brbsix for initial Py3 porting.
-- WangFenjin for unicode support.
-- timoilya for comparing list of sets when ignoring order.
-- Bernhard10 for significant digits comparison.
-- b-jazz for PEP257 cleanup, Standardize on full names, fixing line endings.
-- finnhughes for fixing __slots__
-- moloney for Unicode vs. Bytes default
-- serv-inc for adding help(deepdiff)
-- movermeyer for updating docs
-- maxrothman for search in inherited class attributes
-- maxrothman for search for types/objects
-- MartyHub for exclude regex paths
-- sreecodeslayer for DeepSearch match_string
-- Brian Maissy (brianmaissy) for weakref fix, enum tests
-- Bartosz Borowik (boba-2) for Exclude types fix when ignoring order
-- Brian Maissy (brianmaissy) for fixing classes which inherit from classes with slots didn't have all of their slots compared
-- Juan Soler (Soleronline) for adding ignore_type_number
-- mthaddon for adding timedelta diffing support
-- Necrophagos for Hashing of the number 1 vs. True
-- gaal-dev for adding exclude_obj_callback
-- Ivan Piskunov (van-ess0) for deprecation warning enhancement.
-- Michał Karaś (MKaras93) for the pretty view
+Authors listed in the order of the contributions:
+
+- [Sep Dehpour (Seperman)](http://www.zepworks.com)
+- [Victor Hahn Castell](http://hahncastell.de) for the tree view and major contributions:
+- [nfvs](https://github.com/nfvs) for Travis-CI setup script.
+- [brbsix](https://github.com/brbsix) for initial Py3 porting.
+- [WangFenjin](https://github.com/WangFenjin) for unicode support.
+- [timoilya](https://github.com/timoilya) for comparing list of sets when ignoring order.
+- [Bernhard10](https://github.com/Bernhard10) for significant digits comparison.
+- [b-jazz](https://github.com/b-jazz) for PEP257 cleanup, Standardize on full names, fixing line endings.
+- [finnhughes](https://github.com/finnhughes) for fixing __slots__
+- [moloney](https://github.com/moloney) for Unicode vs. Bytes default
+- [serv-inc](https://github.com/serv-inc) for adding help(deepdiff)
+- [movermeyer](https://github.com/movermeyer) for updating docs
+- [maxrothman](https://github.com/maxrothman) for search in inherited class attributes
+- [maxrothman](https://github.com/maxrothman) for search for types/objects
+- [MartyHub](https://github.com/MartyHub) for exclude regex paths
+- [sreecodeslayer](https://github.com/sreecodeslayer) for DeepSearch match_string
+- Brian Maissy [brianmaissy](https://github.com/) for weakref fix, enum tests
+- Bartosz Borowik [boba-2](https://github.com/boba-2) for Exclude types fix when ignoring order
+- Brian Maissy [brianmaissy](https://github.com/brianmaissy) for fixing classes which inherit from classes with slots didn't have all of their slots compared
+- Juan Soler [Soleronline](https://github.com/Soleronline) for adding ignore_type_number
+- [mthaddon](https://github.com/mthaddon) for adding timedelta diffing support
+- [Necrophagos](https://github.com/Necrophagos) for Hashing of the number 1 vs. True
+- [gaal-dev](https://github.com/gaal-dev) for adding exclude_obj_callback
+- Ivan Piskunov [van-ess0](https://github.com/van-ess0) for deprecation warning enhancement.
+- Michał Karaś [MKaras93](https://github.com/MKaras93) for the pretty view
+- Christian Kothe [chkothe](https://github.com/chkothe) for the basic support for diffing numpy arrays
+- [Timothy](https://github.com/timson) for truncate_datetime
+- [d0b3rm4n](https://github.com/d0b3rm4n) for bugfix to not apply format to non numbers.
+- [MyrikLD](https://github.com/MyrikLD) for Bug Fix NoneType in ignore type groups
diff --git a/deepdiff/__init__.py b/deepdiff/__init__.py
@@ -1,6 +1,6 @@
 """This module offers the DeepDiff, DeepSearch, grep, Delta and DeepHash classes."""
 # flake8: noqa
-__version__ = '5.0.1'
+__version__ = '5.0.2'
 import logging
 
 if __name__ == '__main__':
diff --git a/deepdiff/diff.py b/deepdiff/diff.py
@@ -1139,6 +1139,9 @@ def __diff(self, level, parents_ids=frozenset(), _original_type=None):
             if report_type_change:
                 self.__diff_types(level)
                 return
+            # This is an edge case where t1=None and None is in the ignore type group.
+            if level.t1 is None:
+                self.__report_result('values_changed', level)
 
         if self.ignore_nan_inequality and isinstance(level.t1, float) and str(level.t1) == str(level.t2) == 'nan':
             return
diff --git a/deepdiff/helper.py b/deepdiff/helper.py
@@ -309,7 +309,9 @@ def type_in_type_group(item, type_group):
 
 
 def type_is_subclass_of_type_group(item, type_group):
-    return isinstance(item, type_group) or issubclass(item, type_group) or type_in_type_group(item, type_group)
+    return isinstance(item, type_group) \
+           or (isinstance(item, type) and issubclass(item, type_group)) \
+           or type_in_type_group(item, type_group)
 
 
 def get_doc(doc_filename):
diff --git a/docs/authors.rst b/docs/authors.rst
@@ -3,47 +3,68 @@
 Authors
 =======
 
-DeepDiff Core Developer:
+Authors listed in the order of the contributions:
 
-- Sep Dehpour
+-  `Sep Dehpour (Seperman)`_
+-  `Victor Hahn Castell`_ for the tree view and major contributions:
+-  `nfvs`_ for Travis-CI setup script.
+-  `brbsix`_ for initial Py3 porting.
+-  `WangFenjin`_ for unicode support.
+-  `timoilya`_ for comparing list of sets when ignoring order.
+-  `Bernhard10`_ for significant digits comparison.
+-  `b-jazz`_ for PEP257 cleanup, Standardize on full names, fixing line
+   endings.
+-  `finnhughes`_ for fixing **slots**
+-  `moloney`_ for Unicode vs. Bytes default
+-  `serv-inc`_ for adding help(deepdiff)
+-  `movermeyer`_ for updating docs
+-  `maxrothman`_ for search in inherited class attributes
+-  `maxrothman`_ for search for types/objects
+-  `MartyHub`_ for exclude regex paths
+-  `sreecodeslayer`_ for DeepSearch match_string
+-  Brian Maissy `brianmaissy`_ for weakref fix, enum tests
+-  Bartosz Borowik `boba-2`_ for Exclude types fix when ignoring order
+-  Brian Maissy `brianmaissy <https://github.com/brianmaissy>`__ for
+   fixing classes which inherit from classes with slots didn’t have all
+   of their slots compared
+-  Juan Soler `Soleronline`_ for adding ignore_type_number
+-  `mthaddon`_ for adding timedelta diffing support
+-  `Necrophagos`_ for Hashing of the number 1 vs. True
+-  `gaal-dev`_ for adding exclude_obj_callback
+-  Ivan Piskunov `van-ess0`_ for deprecation warning enhancement.
+-  Michał Karaś `MKaras93`_ for the pretty view
+-  Christian Kothe `chkothe`_ for the basic support for diffing numpy
+   arrays
+-  `Timothy`_ for truncate_datetime
+-  `d0b3rm4n`_ for bugfix to not apply format to non numbers.
+-  `MyrikLD`_ for Bug Fix NoneType in ignore type groups
 
-    - `Github <https://github.com/seperman>`_
-    - `ZepWorks <http://www.zepworks.com>`_
-    - `Articles about Deepdiff <https://zepworks.com/tags/deepdiff/>`_
-
-And many thanks to the following people for their contributions to DeepDiff!
-
-- Victor Hahn Castell for major contributions
-    - `hahncastell.de <http://hahncastell.de>`_
-    - `flexoptix.net <http://www.flexoptix.net>`_
-- nfvs for Travis-CI setup script.
-- brbsix for initial Py3 porting.
-- WangFenjin for Unicode support.
-- timoilya for comparing list of sets when ignoring order.
-- Bernhard10 for significant digits comparison.
-- b-jazz for PEP257 cleanup, Standardize on full names, fixing line endings.
-- finnhughes for fixing __slots__
-- moloney for Unicode vs. Bytes default
-- serv-inc for adding help(deepdiff)
-- movermeyer for updating docs
-- maxrothman for search in inherited class attributes
-- maxrothman for search for types/objects
-- MartyHub for exclude regex paths
-- sreecodeslayer for DeepSearch match_string
-- Brian Maissy (brianmaissy) for weakref fix, enum tests
-- Bartosz Borowik (boba-2) for Exclude types fix when ignoring order
-- Brian Maissy (brianmaissy) for fixing classes which inherit from classes with slots didn't have all of their slots compared
-- Juan Soler (Soleronline) for adding ignore_type_number
-- mthaddon for adding timedelta diffing support
-- Necrophagos for Hashing of the number 1 vs. True
-- Hugo (hugovk) for fixes for Python 3.10 and dropping support for EOL Python 3.4
-- Andrey Gavrilin (gaal-dev) for hashing classes.
-- gaal-dev for adding exclude_obj_callback
-- Ivan Piskunov (van-ess0) for deprecation warning enhancement.
-- Nathaniel Brown (nathanielobrown) Adds support for datetime.time
-- Michał Karaś (MKaras93) for the pretty view
-- Christian Kothe (chkothe) for the basic support for diffing numpy arrays
-- Timothy (timson) for truncate_datetime
-- d0b3rm4n for bugfix to not apply format to non numbers.
+.. _Sep Dehpour (Seperman): http://www.zepworks.com
+.. _Victor Hahn Castell: http://hahncastell.de
+.. _nfvs: https://github.com/nfvs
+.. _brbsix: https://github.com/brbsix
+.. _WangFenjin: https://github.com/WangFenjin
+.. _timoilya: https://github.com/timoilya
+.. _Bernhard10: https://github.com/Bernhard10
+.. _b-jazz: https://github.com/b-jazz
+.. _finnhughes: https://github.com/finnhughes
+.. _moloney: https://github.com/moloney
+.. _serv-inc: https://github.com/serv-inc
+.. _movermeyer: https://github.com/movermeyer
+.. _maxrothman: https://github.com/maxrothman
+.. _MartyHub: https://github.com/MartyHub
+.. _sreecodeslayer: https://github.com/sreecodeslayer
+.. _brianmaissy: https://github.com/
+.. _boba-2: https://github.com/boba-2
+.. _Soleronline: https://github.com/Soleronline
+.. _mthaddon: https://github.com/mthaddon
+.. _Necrophagos: https://github.com/Necrophagos
+.. _gaal-dev: https://github.com/gaal-dev
+.. _van-ess0: https://github.com/van-ess0
+.. _MKaras93: https://github.com/MKaras93
+.. _chkothe: https://github.com/chkothe
+.. _Timothy: https://github.com/timson
+.. _d0b3rm4n: https://github.com/d0b3rm4n
+.. _MyrikLD: https://github.com/MyrikLD
 
 Back to :doc:`/index`
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 DeepDiff Changelog
 
+- v5-0-2: Bug Fix NoneType in ignore type groups https://github.com/seperman/deepdiff/issues/207
 - v5-0-1: Bug fix to not apply format to non numbers.
 - v5-0-0: Introducing the Delta object, Improving Numpy support, Fixing tuples comparison when ignore_order=True, Dramatically improving the results when ignore_order=True by running in passes, Introducing pretty print view, deep_distance, purge, progress logging, cache and truncate_datetime.
 - v4-3-3: Adds support for datetime.time
diff --git a/docs/conf.py b/docs/conf.py
@@ -60,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '5.0.1'
+version = '5.0.2'
 # The full version, including alpha/beta/rc tags.
-release = '5.0.1'
+release = '5.0.2'
 
 load_dotenv(override=True)
 DOC_VERSION = os.environ.get('DOC_VERSION', version)
diff --git a/docs/index.rst b/docs/index.rst
@@ -4,7 +4,7 @@
    contain the root `toctree` directive.
 
 
-DeepDiff 5.0.1 documentation!
+DeepDiff 5.0.2 documentation!
 =============================
 
 *****************
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.0.1
+current_version = 5.0.2
 commit = True
 tag = True
 tag_name = {new_version}
diff --git a/setup.py b/setup.py
diff --git a/tests/test_diff_text.py b/tests/test_diff_text.py
