Merge pull request #157 from mrocklin/py3.4

add 3.4 to .travis.yml

Author: mrocklin

.travis.yml

@@ -4,6 +4,7 @@ python:
     - "2.7"
     - "3.2"
     - "3.3"
+    - "3.4"
     - "pypy"
 
 env:

release-notes

@@ -28,3 +28,28 @@ New in 0.6.0
 *   Flattened directory structure
 *   Add `pluck` function from underscore.js
 *   Remove `sandbox.jackknife`
+
+
+New in 0.6.1
+
+
+*   Avoid generators, favor map.  Assists in debugging.
+*   Cleaner `curry` implementation
+*   `EqualityHashKey` added to sandbox
+*   New `join` operation
+*   `join`, `groupby`, ... accept non-callable key functions.
+*   Fix bug in `get` where `get([1], coll)` used to return element rather than
+    length-one tuple
+*   `juxt` returns a tuple, not a generator
+*   `reduceby` no longer requires `default` keyword argument
+*   Toolz builds on binstar build
+*   Fix serialization issues for `juxt`, `complement`
+*   Many speed improvements:
+    *   Cache method lookup
+    *   Faster `merge_sorted` without key
+    *   An additional round of tuning on `groupby`
+
+
+New Authors:
+
+Leonid Shvechikov,  José Ricardo, Lars Buitinck, Tom Prince

toolz/functoolz.py

@@ -1,6 +1,7 @@
 from functools import reduce, partial
 import inspect
 import operator
+import sys
 
 
 __all__ = ('identity', 'thread_first', 'thread_last', 'memoize', 'compose',
@@ -84,6 +85,13 @@ def evalform_back(val, form):
     return reduce(evalform_back, forms, val)
 
 
+# This is a kludge for Python 3.4.0 support
+# currently len(inspect.getargspec(map).args) == 0, a wrong result.
+# As this is fixed in future versions then hopefully this kludge can be
+# removed.
+known_numargs = {map: 2, filter: 2, reduce: 2}
+
+
 def _num_required_args(func):
     """ Number of args for func
 
@@ -99,6 +107,8 @@ def _num_required_args(func):
     >>> print(_num_required_args(bar))
     None
     """
+    if func in known_numargs:
+        return known_numargs[func]
     try:
         spec = inspect.getargspec(func)
         if spec.varargs:
@@ -142,8 +152,10 @@ def __init__(self, func, *args, **kwargs):
             raise TypeError("Input must be callable")
 
         # curry- or functools.partial-like object?  Unpack and merge arguments
-        if (hasattr(func, 'func') and hasattr(func, 'args')
-                and hasattr(func, 'keywords')):
+        if (hasattr(func, 'func')
+                and hasattr(func, 'args')
+                and hasattr(func, 'keywords')
+                and isinstance(func.args, tuple)):
             _kwargs = {}
             if func.keywords:
                 _kwargs.update(func.keywords)
@@ -219,6 +231,45 @@ def __setstate__(self, state):
         self.__dict__.update(userdict)
 
 
+def has_kwargs(f):
+    """ Does a function have keyword arguments?
+
+    >>> def f(x, y=0):
+    ...     return x + y
+
+    >>> has_kwargs(f)
+    True
+    """
+    if sys.version_info[0] == 2:  # pragma: no cover
+        spec = inspect.getargspec(f)
+        return bool(spec and (spec.keywords or spec.defaults))
+    if sys.version_info[0] == 3:  # pragma: no cover
+        spec = inspect.getfullargspec(f)
+        return bool(spec.defaults)
+
+
+def isunary(f):
+    """ Does a function have only a single argument?
+
+    >>> def f(x):
+    ...     return x
+
+    >>> isunary(f)
+    True
+    >>> isunary(lambda x, y: x + y)
+    False
+    """
+    try:
+        if sys.version_info[0] == 2:  # pragma: no cover
+            spec = inspect.getargspec(f)
+        if sys.version_info[0] == 3:  # pragma: no cover
+            spec = inspect.getfullargspec(f)
+        return bool(spec and spec.varargs is None and not has_kwargs(f)
+                    and len(spec.args) == 1)
+    except TypeError:  # pragma: no cover
+        return None    # in Python < 3.4 builtins fail, return None
+
+
 @curry
 def memoize(func, cache=None, key=None):
     """ Cache a function's result for speedy future evaluation
@@ -260,12 +311,10 @@ def memoize(func, cache=None, key=None):
         cache = {}
 
     try:
-        spec = inspect.getargspec(func)
-        may_have_kwargs = bool(not spec or spec.keywords or spec.defaults)
+        may_have_kwargs = has_kwargs(func)
         # Is unary function (single arg, no variadic argument or keywords)?
-        is_unary = (spec and spec.varargs is None and not may_have_kwargs
-                    and len(spec.args) == 1)
-    except TypeError:
+        is_unary = isunary(func)
+    except TypeError:  # pragma: no cover
         may_have_kwargs = True
         is_unary = False
 

toolz/tests/test_functoolz.py

@@ -314,7 +314,7 @@ def f(x, y=0):
 
 
 def test__num_required_args():
-    assert _num_required_args(map) is None
+    assert _num_required_args(map) != 0
     assert _num_required_args(lambda x: x) == 1
     assert _num_required_args(lambda x, y: x) == 2