diff --git a/README.rst b/README.rst index a953a1f..1a89aec 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ nested_lookup ############# -.. image:: https://img.shields.io/badge/pypi-0.0.2-green.svg +.. image:: https://img.shields.io/badge/pypi-0.0.3-green.svg :target: https://pypi.python.org/pypi/nested-lookup .. image:: https://img.shields.io/badge/coverage-100%-green.svg diff --git a/nested_lookup.py b/nested_lookup.py index fd4b97a..31d21d6 100644 --- a/nested_lookup.py +++ b/nested_lookup.py @@ -1,3 +1,5 @@ +from six import iteritems + def nested_lookup(key, document): """Lookup a key in a nested document, return a list of values""" return list(_nested_lookup(key, document)) @@ -10,7 +12,7 @@ def _nested_lookup(key, document): yield result if isinstance(document, dict): - for k, v in document.items(): + for k, v in iteritems(document): if k == key: yield v elif isinstance(v, dict): diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..6571d6c --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# https://pythonhosted.org/six/#six.iteritems +six diff --git a/setup.py b/setup.py index 06d229a..db2cbfc 100644 --- a/setup.py +++ b/setup.py @@ -2,9 +2,14 @@ from setuptools import setup +from pip.req import parse_requirements + +# get list of requirement strings from requirements.txt +requires = map(lambda ir : str(ir.req), parse_requirements('requirements.txt')) + setup( name = 'nested-lookup', - version = '0.0.2', + version = '0.0.3', description = 'lookup a key in a deeply nested document of dicts and lists', keywords = 'nested document dictionary dict list lookup schema json xml yaml', long_description = open('README.rst').read(), @@ -18,6 +23,7 @@ setup( py_modules = ['nested_lookup'], include_package_data = True, + install_requires = requires, ) # setup keyword args: http://peak.telecommunity.com/DevCenter/setuptools