Merge branch 'origin/development'

cool-RR · cool-RR · commit 98a0bf10e604 · 2013-09-02T02:46:51.000+03:00
Conflicts:
	python_toolbox/misc_tools/__init__.py
	python_toolbox/misc_tools/misc_tools.py
diff --git a/python_toolbox/misc_tools/__init__.py b/python_toolbox/misc_tools/__init__.py
@@ -8,6 +8,6 @@
     _ascii_variable_pattern, is_legal_ascii_variable_name,
     is_magic_variable_name, get_actual_type, is_number, identity_function,
     do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle,
-    general_sum, general_product, is_legal_email_address
+    general_sum, general_product, is_legal_email_address, is_type
 )
 from . import name_mangling
diff --git a/python_toolbox/misc_tools/misc_tools.py b/python_toolbox/misc_tools/misc_tools.py
@@ -268,4 +268,9 @@ def general_product(things, start=None):
 
     
 def is_legal_email_address(email_address_candidate):
-    return bool(_email_pattern.match(email_address_candidate))
+    return bool(_email_pattern.match(email_address_candidate))
+
+
+def is_type(thing):
+    return isinstance(thing, (type, types.ClassType))
+
diff --git a/python_toolbox/monkeypatching_tools.py b/python_toolbox/monkeypatching_tools.py
@@ -5,13 +5,15 @@
 
 import types
 
+from python_toolbox import misc_tools
 from python_toolbox import decorator_tools
 from python_toolbox import caching
 
 
 @decorator_tools.helpful_decorator_builder
-def monkeypatch_method(class_, name=None):
+def monkeypatch_method(monkeypatchee, name=None):
     '''
+    blocktododoc
     Monkeypatch a method into a class.
     
     Example:
@@ -32,28 +34,44 @@ def my_method(a):
     
     You can also use this to monkeypatch a `CachedProperty` into a class.
     '''
+    
+    monkeypatchee_is_a_class = misc_tools.is_type(monkeypatchee)
+    class_of_monkeypatchee = monkeypatchee if monkeypatchee_is_a_class else \
+                                      misc_tools.get_actual_type(monkeypatchee)
+    
     def decorator(function):
         # Note that unlike most decorators, this decorator retuns the function
         # it was given without modifying it. It modifies the class only.
         if isinstance(function, types.FunctionType):
             name_ = name or function.__name__
-            new_method = types.MethodType(function, None, class_)
+            
+            new_method = types.MethodType(function, None, monkeypatchee) if \
+                monkeypatchee_is_a_class else types.MethodType(function,
+                                         monkeypatchee, class_of_monkeypatchee)
             # todo: Last line was: `new_method = types.MethodType(function,
             # class_)`, is subtly wrong, make tests to prove
-            setattr(class_, name_, new_method)
-            return function
-        elif isinstance(function, caching.CachedProperty):
-            cached_property = function
-            if not isinstance(cached_property.getter, types.FunctionType):
-                raise NotImplemented
-            name_ = cached_property.getter.__name__
-            setattr(class_, name_, cached_property)
-            return cached_property
-        elif isinstance(function, (classmethod, staticmethod)):
-            name_ = function.__func__.__name__
-            setattr(class_, name_, function)
+            setattr(monkeypatchee, name_, new_method)
             return function
         else:
-            raise NotImplemented("`monkeypatch_method` doesn't know how to "
-                                 "handle this kind of function.")
-    return decorator
+            # `function` is probably some kind of descriptor.
+            if not monkeypatchee_is_a_class:
+                raise NotImplemented("I don't know how to monkeypatch a "
+                                     "descriptor onto a non-class object.")
+            ### Getting name of descriptor: ###################################
+            #                                                                 #
+            if isinstance(function, caching.CachedProperty):
+                if not isinstance(function.getter, types.FunctionType):
+                    raise NotImplemented
+                name_ = function.getter.__name__
+            elif isinstance(function, (classmethod, staticmethod)):
+                name_ = function.__func__.__name__
+            else:
+                raise NotImplemented("`monkeypatch_method` doesn't know how "
+                                     "to handle this kind of function.")
+            #                                                                 #
+            ### Finished getting name of descriptor. ##########################
+            setattr(monkeypatchee, name_, function)
+            return function
+        
+    return decorator
+
diff --git a/test_python_toolbox/test_monkeypatching_tools.py b/test_python_toolbox/test_monkeypatching_tools.py
@@ -153,8 +153,33 @@ def my_funky_class_method(cls):
     a0 = A()
     assert a0.my_funky_class_method() == A
         
-        
-        
-        
+
+def test_directly_on_object():
+    
+    class A(object):
+        def woof(self):
+            return 'woof'
+
+    a0 = A()
+    a1 = A()
+
+    @monkeypatching_tools.monkeypatch_method(a0)
+    def meow(a):
+        return 'not meow'
+    
+    @monkeypatching_tools.monkeypatch_method(a0)
+    def woof(a):
+        return 'not woof'
+    
+    assert a0.meow() == 'not meow'
+    assert a0.woof() == 'not woof'
     
+    assert a1.woof() == 'woof'
+    
+    with cute_testing.RaiseAssertor(AttributeError):
+        A.meow()
+    with cute_testing.RaiseAssertor(AttributeError):
+        a1.meow()
+        
+    assert A.woof(a0) == 'woof'
     

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`	`_ascii_variable_pattern, is_legal_ascii_variable_name,`
`9`	`9`	`is_magic_variable_name, get_actual_type, is_number, identity_function,`
`10`	`10`	`do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle,`
`11`		`- general_sum, general_product, is_legal_email_address`
	`11`	`+ general_sum, general_product, is_legal_email_address, is_type`
`12`	`12`	`)`
`13`	`13`	`from . import name_mangling`