Improvements to "compose"

.binstar.yml

@@ -6,9 +6,7 @@ platform:
   - win-64
   - win-32
 engine:
-  - python=2.6
   - python=2.7
-  - python=3.3
   - python=3.4
 script:
   - conda build conda.recipe

.gitignore

@@ -2,3 +2,5 @@
 build/
 dist/
 *.egg-info/
+bench/shakespeare.txt
+.coverage

.travis.yml

@@ -1,22 +1,23 @@
 sudo: false
 language: python
 python:
-    - "2.6"
     - "2.7"
-    - "3.3"
     - "3.4"
     - "3.5"
     - "3.6"
     - "3.7-dev"
     - "pypy"
 
+# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
+matrix:
+    include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
+
 env:
     - PEP8_IGNORE="E731,W503,E402"
 
-matrix:
-  allow_failures:
-    - python: "3.7-dev"
-
 # command to install dependencies
 install:
     - pip install coverage pep8 pytest

README.rst

@@ -1,7 +1,7 @@
 Toolz
 =====
 
-|Build Status| |Coverage Status| |Version Status| |Downloads|
+|Build Status| |Coverage Status| |Version Status|
 
 A set of utility functions for iterators, functions, and dictionaries.
 
@@ -30,7 +30,7 @@ Structure and Heritage
 ``unique``, ``interpose``,
 
 |literal functoolz|_, for higher-order functions. Examples: ``memoize``,
-``curry``, ``compose``
+``curry``, ``compose``,
 
 |literal dicttoolz|_, for operations on dictionaries. Examples: ``assoc``,
 ``update-in``, ``merge``.
@@ -73,11 +73,11 @@ This builds a standard wordcount function from pieces within ``toolz``:
 Dependencies
 ------------
 
-``toolz`` supports Python 2.6+ and Python 3.3+ with a common codebase.
+``toolz`` supports Python 2.7 and Python 3.4+ with a common codebase.
 It is pure Python and requires no dependencies beyond the standard
 library.
 
-It is, in short, a light weight dependency.
+It is, in short, a lightweight dependency.
 
 
 CyToolz
@@ -86,21 +86,21 @@ CyToolz
 The ``toolz`` project has been reimplemented in `Cython <http://cython.org>`__.
 The ``cytoolz`` project is a drop-in replacement for the Pure Python
 implementation.
-See `CyToolz Github Page <https://github.com/pytoolz/cytoolz/>`__ for more
+See `CyToolz GitHub Page <https://github.com/pytoolz/cytoolz/>`__ for more
 details.
 
 See Also
 --------
 
--  `Underscore.js <http://underscorejs.org>`__: A similar library for
+-  `Underscore.js <https://underscorejs.org/>`__: A similar library for
    JavaScript
--  `Enumerable <http://ruby-doc.org/core-2.0.0/Enumerable.html>`__: A
+-  `Enumerable <https://ruby-doc.org/core-2.0.0/Enumerable.html>`__: A
    similar library for Ruby
--  `Clojure <http://clojure.org>`__: A functional language whose
+-  `Clojure <https://clojure.org/>`__: A functional language whose
    standard library has several counterparts in ``toolz``
--  `itertools <http://docs.python.org/2/library/itertools.html>`__: The
+-  `itertools <https://docs.python.org/2/library/itertools.html>`__: The
    Python standard library for iterator tools
--  `functools <http://docs.python.org/2/library/functools.html>`__: The
+-  `functools <https://docs.python.org/2/library/functools.html>`__: The
    Python standard library for function tools
 
 Contributions Welcome
@@ -129,6 +129,4 @@ We're friendly.
 .. |Coverage Status| image:: https://coveralls.io/repos/pytoolz/toolz/badge.svg?branch=master
    :target: https://coveralls.io/r/pytoolz/toolz
 .. |Version Status| image:: https://badge.fury.io/py/toolz.svg
-   :target: http://badge.fury.io/py/toolz
-.. |Downloads| image:: https://img.shields.io/pypi/dm/toolz.svg
-   :target: https://pypi.python.org/pypi/toolz/
+   :target: https://badge.fury.io/py/toolz

doc/source/api.rst

@@ -34,6 +34,7 @@ Itertoolz
    partition
    partition_all
    peek
+   peekn
    pluck
    random_sample
    reduceby

doc/source/heritage.rst

@@ -39,13 +39,13 @@ philosophy but mimics declarative database languages rather than functional
 ones.  Enumerable_ is is the closest project in Ruby.  Other excellent projects
 also exist within the Python ecosystem, most notably Fn.py_ and Funcy_.
 
-.. [itertools] http://docs.python.org/2/library/itertools.html
-.. [functools] http://docs.python.org/2/library/functools.html
-.. [itertoolz] http://github.com/pytoolz/itertoolz
-.. [functoolz] http://github.com/pytoolz/functoolz
-.. [Underscore.js] http://underscorejs.org
-.. [cheatsheet] http://clojure.org/cheatsheet
-.. [Guido] http://python-history.blogspot.com/2009/04/origins-of-pythons-functional-features.html
-.. [Enumerable] http://ruby-doc.org/core-2.0.0/Enumerable.html
+.. [itertools] https://docs.python.org/2/library/itertools.html
+.. [functools] https://docs.python.org/2/library/functools.html
+.. [itertoolz] https://github.com/mrocklin/itertoolz
+.. [functoolz] https://github.com/mrocklin/functoolz
+.. [Underscore.js] https://underscorejs.org
+.. [cheatsheet] https://clojure.org/cheatsheet
+.. [Guido] https://python-history.blogspot.com/2009/04/origins-of-pythons-functional-features.html
+.. [Enumerable] https://ruby-doc.org/core-2.0.0/Enumerable.html
 .. [funcy] https://github.com/suor/funcy/
 .. [fn.py] https://github.com/kachayev/fn.py

doc/source/install.rst

@@ -11,4 +11,4 @@ three ways:
 
 1.  Toolz is pure Python
 2.  Toolz relies only on the standard library
-3.  Toolz simultaneously supports Python versions 2.6, 2.7, 3.3, 3.4, 3.5, 3.6, PyPy
+3.  Toolz simultaneously supports Python versions 2.7, 3.4+, PyPy

doc/source/streaming-analytics.rst

@@ -38,7 +38,7 @@ These functions correspond to the SQL commands ``SELECT`` and ``WHERE``.
    ...                map(get([1, 2])),
    ...                list)
 
-*note: this uses the curried_ versions of ``map`` and ``filter``.*
+Note: this uses the `curried`_ versions of ``map`` and ``filter``.
 
 Of course, these operations are also well supported with standard
 list/generator comprehension syntax.  This syntax is more often used and
@@ -81,8 +81,8 @@ groups.
 
 .. code::
 
-   >>> from toolz import groupby, valmap, compose
-   >>> from toolz.curried import get, pluck
+   >>> from toolz import compose
+   >>> from toolz.curried import get, pluck, groupby, valmap
 
    >>> groupby(get(3), accounts)
    {'F': [(1, 'Alice', 100, 'F'), (5, 'Edith', 300, 'F')],

setup.py

@@ -7,7 +7,7 @@
 setup(name='toolz',
       version=toolz.__version__,
       description='List processing tools and functional utilities',
-      url='http://github.com/pytoolz/toolz/',
+      url='https://github.com/pytoolz/toolz/',
       author='https://raw.github.com/pytoolz/toolz/master/AUTHORS.md',
       maintainer='Matthew Rocklin',
       maintainer_email='mrocklin@gmail.com',
@@ -21,16 +21,17 @@
       long_description=(open('README.rst').read() if exists('README.rst')
                         else ''),
       zip_safe=False,
+      python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
       classifiers=[
           "Development Status :: 5 - Production/Stable",
           "License :: OSI Approved :: BSD License",
           "Programming Language :: Python",
-          "Programming Language :: Python :: 2.6",
+          "Programming Language :: Python :: 2",
           "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3",
-          "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
           "Programming Language :: Python :: 3.6",
+          "Programming Language :: Python :: 3.7",
           "Programming Language :: Python :: Implementation :: CPython",
           "Programming Language :: Python :: Implementation :: PyPy"])

tlz/_build_tlz.py

@@ -1,15 +1,15 @@
 import sys
 import types
 import toolz
-from toolz.compatibility import import_module
+from importlib import import_module
 
 
 class TlzLoader(object):
     """ Finds and loads ``tlz`` modules when added to sys.meta_path"""
     def __init__(self):
-        self.always_from_toolz = set([
+        self.always_from_toolz = {
             toolz.pipe,
-        ])
+        }
 
     def _load_toolz(self, fullname):
         rv = {}

toolz/_signatures.py

@@ -16,8 +16,9 @@
 import inspect
 import itertools
 import operator
+from importlib import import_module
 
-from .compatibility import PY3, import_module
+from .compatibility import PY3
 from .functoolz import (is_partial_args, is_arity, has_varargs,
                         has_keywords, num_required_args)
 
@@ -640,8 +641,8 @@ def get_exclude_keywords(num_pos_only, sigspec):
     def signature_or_spec(func):
         try:
             return inspect.signature(func)
-        except (ValueError, TypeError) as e:
-            return e
+        except (ValueError, TypeError):
+            return None
 
 else:  # pragma: py3 no cover
     def num_pos_args(sigspec):
@@ -662,8 +663,8 @@ def get_exclude_keywords(num_pos_only, sigspec):
     def signature_or_spec(func):
         try:
             return inspect.getargspec(func)
-        except TypeError as e:
-            return e
+        except TypeError:
+            return None
 
 
 def expand_sig(sig):
@@ -697,7 +698,7 @@ def expand_sig(sig):
         num_pos_only = num_pos_args(sigspec)
         keyword_only = ()
     keyword_exclude = get_exclude_keywords(num_pos_only, sigspec)
-    return (num_pos_only, func, keyword_only + keyword_exclude, sigspec)
+    return num_pos_only, func, keyword_only + keyword_exclude, sigspec
 
 
 signatures = {}

toolz/compatibility.py

@@ -1,13 +1,12 @@
 import operator
 import sys
 PY3 = sys.version_info[0] > 2
-PY33 = sys.version_info[0] == 3 and sys.version_info[1] == 3
 PY34 = sys.version_info[0] == 3 and sys.version_info[1] == 4
 PYPY = hasattr(sys, 'pypy_version_info')
 
 __all__ = ('map', 'filter', 'range', 'zip', 'reduce', 'zip_longest',
            'iteritems', 'iterkeys', 'itervalues', 'filterfalse',
-           'PY3', 'PY34', 'PYPY', 'import_module')
+           'PY3', 'PY34', 'PYPY')
 
 if PY3:
     map = map
@@ -20,6 +19,7 @@
     iteritems = operator.methodcaller('items')
     iterkeys = operator.methodcaller('keys')
     itervalues = operator.methodcaller('values')
+    from collections.abc import Sequence
 else:
     range = xrange
     reduce = reduce
@@ -31,10 +31,4 @@
     iteritems = operator.methodcaller('iteritems')
     iterkeys = operator.methodcaller('iterkeys')
     itervalues = operator.methodcaller('itervalues')
-
-try:
-    from importlib import import_module
-except ImportError:
-    def import_module(name):
-        __import__(name)
-        return sys.modules[name]
+    from collections import Sequence

toolz/curried/__init__.py

@@ -26,9 +26,11 @@
 import toolz
 from . import operator
 from toolz import (
+    apply,
     comp,
     complement,
     compose,
+    compose_left,
     concat,
     concatv,
     count,
@@ -59,6 +61,7 @@
 assoc_in = toolz.curry(toolz.assoc_in)
 cons = toolz.curry(toolz.cons)
 countby = toolz.curry(toolz.countby)
+dissoc = toolz.curry(toolz.dissoc)
 do = toolz.curry(toolz.do)
 drop = toolz.curry(toolz.drop)
 excepts = toolz.curry(toolz.excepts)
@@ -80,6 +83,7 @@
 partition = toolz.curry(toolz.partition)
 partition_all = toolz.curry(toolz.partition_all)
 partitionby = toolz.curry(toolz.partitionby)
+peekn = toolz.curry(toolz.peekn)
 pluck = toolz.curry(toolz.pluck)
 random_sample = toolz.curry(toolz.random_sample)
 reduce = toolz.curry(toolz.reduce)

toolz/curried/operator.py

@@ -11,8 +11,8 @@ def should_curry(f):
 
 
 locals().update(
-    dict((name, curry(f) if should_curry(f) else f)
-         for name, f in vars(operator).items() if callable(f)),
+    {name: curry(f) if should_curry(f) else f
+     for name, f in vars(operator).items() if callable(f)},
 )
 
 # Clean up the namespace.