-

cool-RR · cool-RR · commit 878531c128e0 · 2014-01-24T16:56:19.000+02:00
diff --git a/source_py3/python_toolbox/dict_tools.py b/source_py3/python_toolbox/dict_tools.py
@@ -9,7 +9,7 @@
 from python_toolbox import comparison_tools
 
 
-def filter_items(d, condition, force_dict_type=None):
+def filter_items(d, condition, double=False, force_dict_type=None):
     '''
     Get new dict with items from `d` that satisfy the `condition` functions.
     
@@ -18,16 +18,31 @@ def filter_items(d, condition, force_dict_type=None):
     The newly created dict will be of the same class as `d`, e.g. if you passed
     an ordered dict as `d`, the result will be an ordered dict, using the
     correct order.
+    
+    Specify `double=True` to get a tuple of two dicts instead of one. The
+    second dict will have all the rejected items.
     '''
     # todo future: possibly shallow-copy `d` to allow for dict classes that
     # have more state, (like default factory.)
     if force_dict_type is not None:
         dict_type = force_dict_type
     else:
         dict_type = type(d) if (type(d).__name__ != 'dictproxy') else dict
-    return dict_type(
-        (key, value) for (key, value) in d.items() if condition(key, value)
-    )
+        
+    if double:
+        return tuple(
+            map(
+                dict_type,
+                cute_iter_tools.double_filter(
+                    lambda key_value: condition(key_value[0], key_value[1]),
+                    d.items()
+                )
+            )
+        )
+    else:
+        return dict_type(
+            (key, value) for (key, value) in d.items() if condition(key, value)
+        )
 
 
 def get_list(d, iterable):
diff --git a/source_py3/python_toolbox/monkeypatching_tools.py b/source_py3/python_toolbox/monkeypatching_tools.py
@@ -88,29 +88,48 @@ def decorator(function):
     return decorator
 
 
-def change_defaults(function, new_defaults={}):
+def change_defaults(function=None, new_defaults={}):
     def change_defaults_(function_, new_defaults_):
         signature = inspect.Signature.from_function(function_)
         defaults = list(function_.__defaults__ or ())
+        kwdefaults = function_.__kwdefaults__ or {}
         defaultful_parameters = dict_tools.filter_items(
             signature.parameters,
             lambda name, parameter: parameter.default != inspect._empty,
             force_dict_type=collections.OrderedDict
         )
-        for i, parameter_name in enumerate(defaultful_parameters):
+        (keyword_only_defaultful_parameters,
+         non_keyword_only_defaultful_parameters) = dict_tools.filter_items(
+             defaultful_parameters,
+             lambda name, parameter: parameter.kind == inspect._KEYWORD_ONLY,
+             double=True, 
+         )
+        
+        for parameter_name in keyword_only_defaultful_parameters:
+            if parameter_name in new_defaults_:
+                kwdefaults[parameter_name] = new_defaults_[parameter_name]
+                
+        for i, parameter_name in \
+                             enumerate(non_keyword_only_defaultful_parameters):
             if parameter_name in new_defaults_:
                 defaults[i] = new_defaults_[parameter_name]
                 
         function_.__defaults__ = tuple(defaults)
+        function_.__kwdefaults__ = kwdefaults
+        
+        return function_
 
-    if not callable(function) and new_defaults == {}:
+    if not callable(function):
         # Decorator mode:
-        actual_new_defaults = new_defaults or function or {}
+        if function is None:
+            actual_new_defaults = new_defaults
+        else:
+            actual_new_defaults = function
         return lambda function_: change_defaults_(function_,
                                                   actual_new_defaults)
     else:
         # Normal usage mode:
-        change_defaults_(function, new_defaults)
+        return change_defaults_(function, new_defaults)
         
         
     
diff --git a/source_py3/test_python_toolbox/test_monkeypatching_tools/test_change_defaults.py b/source_py3/test_python_toolbox/test_monkeypatching_tools/test_change_defaults.py
@@ -17,10 +17,10 @@ def f1(alpha, beta, *args, gamma=10, delta=20, **kwargs):
     @monkeypatching_tools.change_defaults({'gamma': 100})
     def f2(alpha, beta, *args, gamma=10, delta=20, **kwargs):
         return (alpha, beta, args, gamma, delta, kwargs)
-    assert f2(1, 2) == (1, 2, (), 100, 400, {})
+    assert f2(1, 2) == (1, 2, (), 100, 20, {})
         
     @monkeypatching_tools.change_defaults(new_defaults={'gamma': 1000})
     def f3(alpha, beta, *args, gamma=10, delta=20, **kwargs):
         return (alpha, beta, args, gamma, delta, kwargs)
-    assert f3(1, 2) == (1, 2, (), 1000, 400, {})
+    assert f3(1, 2) == (1, 2, (), 1000, 20, {})
         
