From c1ca4c1e1e21c27aea7661235defd725343c65df Mon Sep 17 00:00:00 2001 From: Ramesh RV Date: Mon, 24 Sep 2018 12:23:56 +0530 Subject: [PATCH] Reverted PEP8 correction --- nested_lookup/nested_lookup.py | 18 +++---------- test_nested_loopkup.py | 47 ++++++++++++++++------------------ 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/nested_lookup/nested_lookup.py b/nested_lookup/nested_lookup.py index b541fbb..cc14075 100644 --- a/nested_lookup/nested_lookup.py +++ b/nested_lookup/nested_lookup.py @@ -2,26 +2,20 @@ from six import iteritems from collections import defaultdict - def nested_lookup(key, document, wild=False, with_keys=False): """Lookup a key in a nested document, return a list of values""" if with_keys: d = defaultdict(list) - for k, v in _nested_lookup( - key, document, wild=wild, with_keys=with_keys - ): + for k, v in _nested_lookup(key, document, wild=wild, with_keys=with_keys): d[k].append(v) return d return list(_nested_lookup(key, document, wild=wild, with_keys=with_keys)) - def _nested_lookup(key, document, wild=False, with_keys=False): """Lookup a key in a nested document, yield a value""" if isinstance(document, list): for d in document: - for result in _nested_lookup( - key, d, wild=wild, with_keys=with_keys - ): + for result in _nested_lookup(key, d, wild=wild, with_keys=with_keys): yield result if isinstance(document, dict): @@ -32,15 +26,11 @@ def _nested_lookup(key, document, wild=False, with_keys=False): else: yield v elif isinstance(v, dict): - for result in _nested_lookup( - key, v, wild=wild, with_keys=with_keys - ): + for result in _nested_lookup(key, v, wild=wild, with_keys=with_keys): yield result elif isinstance(v, list): for d in v: - for result in _nested_lookup( - key, d, wild=wild, with_keys=with_keys - ): + for result in _nested_lookup(key, d, wild=wild, with_keys=with_keys): yield result diff --git a/test_nested_loopkup.py b/test_nested_loopkup.py index 9dcc10b..2ab212f 100644 --- a/test_nested_loopkup.py +++ b/test_nested_loopkup.py @@ -6,14 +6,14 @@ from nested_lookup import nested_lookup, get_all_keys class TestNestedLookup(TestCase): def setUp(self): - self.subject_dict = {'a': 1, 'b': {'d': 100}, 'c': {'d': 200}} + self.subject_dict = {'a':1,'b':{'d':100},'c':{'d':200}} self.subject_dict2 = { - 'name': 'Russell Ballestrini', - 'email_address': 'test1@example.com', - 'other': { - 'secondary_email': 'test2@example.com', - 'EMAIL_RECOVERY': 'test3@example.com', - 'email_address': 'test4@example.com', + 'name' : 'Russell Ballestrini', + 'email_address' : 'test1@example.com', + 'other' : { + 'secondary_email' : 'test2@example.com', + 'EMAIL_RECOVERY' : 'test3@example.com', + 'email_address' : 'test4@example.com', }, } @@ -22,34 +22,34 @@ class TestNestedLookup(TestCase): self.assertEqual(2, len(results)) self.assertIn(100, results) self.assertIn(200, results) - self.assertSetEqual({100, 200}, set(results)) + self.assertSetEqual({100,200}, set(results)) def test_nested_lookup_wrapped_in_list(self): results = nested_lookup('d', [{}, self.subject_dict, {}]) self.assertEqual(2, len(results)) self.assertIn(100, results) self.assertIn(200, results) - self.assertSetEqual({100, 200}, set(results)) + self.assertSetEqual({100,200}, set(results)) def test_nested_lookup_wrapped_in_list_in_dict_in_list(self): - results = nested_lookup('d', [{}, {'H': [self.subject_dict]}]) + results = nested_lookup('d', [{}, {'H' : [self.subject_dict]} ]) self.assertEqual(2, len(results)) self.assertIn(100, results) self.assertIn(200, results) - self.assertSetEqual({100, 200}, set(results)) + self.assertSetEqual({100,200}, set(results)) def test_nested_lookup_wrapped_in_list_in_list(self): - results = nested_lookup('d', [{}, [self.subject_dict, {}]]) + results = nested_lookup('d', [ {}, [self.subject_dict, {}] ]) self.assertEqual(2, len(results)) self.assertIn(100, results) self.assertIn(200, results) - self.assertSetEqual({100, 200}, set(results)) + self.assertSetEqual({100,200}, set(results)) def test_wild_nested_lookup(self): results = nested_lookup( - key='mail', - document=self.subject_dict2, - wild=True, + key = 'mail', + document = self.subject_dict2 + wild = True, ) self.assertEqual(4, len(results)) self.assertIn('test1@example.com', results) @@ -58,26 +58,23 @@ class TestNestedLookup(TestCase): def test_wild_with_keys_nested_lookup(self): matches = nested_lookup( - key='mail', - document=self.subject_dict2, - wild=True, - with_keys=True, + key = 'mail', + document = self.subject_dict2, + wild = True, + with_keys = True, ) self.assertEqual(3, len(matches)) self.assertIn('email_address', matches) self.assertIn('secondary_email', matches) self.assertIn('EMAIL_RECOVERY', matches) - self.assertSetEqual( - {'test1@example.com', 'test4@example.com'}, - set(matches['email_address']) - ) + self.assertSetEqual({'test1@example.com','test4@example.com'}, set(matches['email_address'])) self.assertIn('test2@example.com', matches['secondary_email']) def test_nested_lookup_with_keys(self): matches = nested_lookup('d', self.subject_dict, with_keys=True) self.assertIn('d', matches) self.assertEqual(2, len(matches['d'])) - self.assertSetEqual({100, 200}, set(matches['d'])) + self.assertSetEqual({100,200}, set(matches['d'])) class TestGetAllKeys(TestCase):