Merge pull request #77 from seperman/dev

v3.3.0

Author: seperman

AUTHORS

@@ -1,13 +1,17 @@
 Authors:
-    * Seperman
-    * Victor Hahn Castell @ Flexoptix
+- Seperman
+- Victor Hahn Castell @ Flexoptix
 
 Also thanks to:
-    * 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
+- 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

README.md

@@ -1,4 +1,4 @@
-# deepdiff v 3.2.1
+# deepdiff v 3.3.0
 
 [![Join the chat at https://gitter.im/deepdiff/Lobby](https://badges.gitter.im/deepdiff/Lobby.svg)](https://gitter.im/deepdiff/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 <!-- ![Downloads](https://img.shields.io/pypi/dm/deepdiff.svg?style=flat) -->
@@ -788,12 +788,14 @@ I was honored to give a talk about how DeepDiff does what it does at Pycon 2016.
 And here is more info: <http://zepworks.com/blog/diff-it-to-digg-it/>
 
 
-##Documentation
+## Documentation
 
 <http://deepdiff.readthedocs.io/en/latest/>
 
-##Changelog
+## Change log
 
+- v3-3-0: Searching for objects and class attributes
+- v3-2-2: Adding help(deepdiff)
 - v3-2-1: Fixing hash of None
 - v3-2-0: Adding grep for search: object | grep(item)
 - v3-1-3: Unicode vs. Bytes default fix
@@ -845,3 +847,7 @@ Also thanks to:
 - 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

README.txt

@@ -1,4 +1,4 @@
-**DeepDiff v 3.2.1**
+**DeepDiff v 3.3.0**
 
 Deep Difference of dictionaries, iterables, strings and other objects. It will recursively look for all the changes.
 
@@ -240,6 +240,8 @@ http://zepworks.com/blog/diff-it-to-digg-it/
 
 **Changelog**
 
+- v3-3-0: Searching for objects and class attributes
+- v3-2-2: Adding help(deepdiff)
 - v3-2-1: Fixing hash of None
 - v3-2-0: Adding grep for search: object | grep(item)
 - v3-1-3: Unicode vs. Bytes default fix
@@ -291,3 +293,7 @@ Also thanks to:
 - 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

deepdiff/search.py

@@ -127,6 +127,13 @@ def __search_obj(self,
                      parents_ids=frozenset({}),
                      is_namedtuple=False):
         """Search objects"""
+        found = False
+        if obj == item:
+            found = True
+            # We report the match but also continue inside the match to see if there are
+            # furthur matches inside the `looped` object.
+            self.__report(report_key='matched_values', key=parent, value=obj)
+
         try:
             if is_namedtuple:
                 obj = obj._asdict()
@@ -139,7 +146,9 @@ def __search_obj(self,
             try:
                 obj = {i: getattr(obj, i) for i in obj.__slots__}
             except AttributeError:
-                self['unprocessed'].append("%s" % parent)
+                if not found:
+                    self['unprocessed'].append("%s" % parent)
+
                 return
 
         self.__search_dict(

docs/conf.py

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

docs/index.rst

@@ -3,7 +3,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-DeepDiff 3.2.1 documentation!
+DeepDiff 3.3.0 documentation!
 =============================
 
 **DeepDiff: Deep Difference of dictionaries, iterables and almost any other object recursively.**
@@ -346,6 +346,8 @@ Indices and tables
 Changelog
 =========
 
+- v3-3-0: Searching for objects and class attributes
+- v3-2-2: Adding help(deepdiff)
 - v3-2-1: Fixing hash of None
 - v3-2-0: Adding grep for search: object | grep(item)
 - v3-1-3: Unicode vs. Bytes default fix

setup.py

@@ -13,7 +13,7 @@
     long_description = "Deep Difference and Search of any Python object/data."
 
 setup(name='deepdiff',
-      version='3.2.1',
+      version='3.3.0',
       description='Deep Difference and Search of any Python object/data.',
       url='https://github.com/seperman/deepdiff',
       download_url='https://github.com/seperman/deepdiff/tarball/master',

tests/test_search.py

@@ -15,6 +15,7 @@
 """
 import unittest
 from deepdiff import DeepSearch, grep
+from datetime import datetime
 import logging
 logging.disable(logging.CRITICAL)
 
@@ -286,6 +287,32 @@ def test_case_insensitive_of_str_in_one_liner(self):
         result = {'matched_values': {'root'}}
         self.assertEqual(DeepSearch(obj, item, verbose_level=1, case_sensitive=False), result)
 
+    def test_none(self):
+        obj = item = None
+        result = {'matched_values': {'root'}}
+        self.assertEqual(DeepSearch(obj, item, verbose_level=1), result)
+
+    def test_complex_obj(self):
+        obj = datetime(2017, 5, 4, 1, 1, 1)
+        item = datetime(2017, 5, 4, 1, 1, 1)
+        result = {'matched_values': {'root'}}
+        self.assertEqual(DeepSearch(obj, item, verbose_level=1), result)
+
+    def test_keep_searching_after_obj_match(self):
+
+        class AlwaysEqual:
+
+            def __init__(self, recurse=True):
+                if recurse:
+                    self.some_attr = AlwaysEqual(recurse=False)
+
+            def __eq__(self, other):
+                return True
+
+        obj = AlwaysEqual()
+        item = AlwaysEqual()
+        result = {'matched_values': {'root', 'root.some_attr'}}
+
     def test_search_inherited_attributes(self):
         class Parent(object):
             a = 1