-

cool-RR · cool-RR · commit 881b537526eb · 2014-01-24T16:26:03.000+02:00
diff --git a/source_py3/python_toolbox/monkeypatching_tools.py b/source_py3/python_toolbox/monkeypatching_tools.py
@@ -4,6 +4,7 @@
 '''Tools for monkeypatching.'''
 
 import sys
+import collections
 import inspect
 import types
 
@@ -90,23 +91,26 @@ def decorator(function):
 def change_defaults(function, new_defaults={}):
     def change_defaults_(function_, new_defaults_):
         signature = inspect.Signature.from_function(function_)
-        defaults = list(function_.__defaults__)
+        defaults = list(function_.__defaults__ or ())
         defaultful_parameters = dict_tools.filter_items(
             signature.parameters,
-            lambda name, parameter: parameter.default != inspect._empty
+            lambda name, parameter: parameter.default != inspect._empty,
+            force_dict_type=collections.OrderedDict
         )
-        for i, (name, parameter) in enumerate(defaultful_parameters):
-            if name in new_defaults_:
-                defaults[i] = new_defaults[name]
+        for i, parameter_name in enumerate(defaultful_parameters):
+            if parameter_name in new_defaults_:
+                defaults[i] = new_defaults_[parameter_name]
+                
+        function_.__defaults__ = tuple(defaults)
 
     if not callable(function) and new_defaults == {}:
         # Decorator mode:
-        actual_new_defaults = function
+        actual_new_defaults = new_defaults or function or {}
         return lambda function_: change_defaults_(function_,
                                                   actual_new_defaults)
     else:
         # Normal usage mode:
-        change_defaults(function, new_defaults)
+        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
@@ -0,0 +1,26 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+from python_toolbox import cute_testing
+
+from python_toolbox import monkeypatching_tools
+
+
+def test():
+    def f1(alpha, beta, *args, gamma=10, delta=20, **kwargs):
+        return (alpha, beta, args, gamma, delta, kwargs)
+    assert f1(1, 2) == (1, 2, (), 10, 20, {})
+    
+    monkeypatching_tools.change_defaults(f1, {'delta': 200,})
+    assert f1(1, 2) == (1, 2, (), 10, 200, {})
+    
+    @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, {})
+        
+    @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, {})
+        
diff --git a/source_py3/test_python_toolbox/test_monkeypatching_tools/test_monkeypatch.py b/source_py3/test_python_toolbox/test_monkeypatching_tools/test_monkeypatch.py
@@ -1,8 +1,6 @@
 # Copyright 2009-2014 Ram Rachum.
 # This program is distributed under the MIT license.
 
-'''Testing module for `python_toolbox.monkeypatching_tools`.'''
-
 
 import sys
 import uuid
