Ticket #6857: robustapply_jython_compatible.patch

django/dispatch/robustapply.py

@@ -5 +5 @@
 and subset the given arguments to match only
 those which are acceptable.
 """
+
+def _has_im_func_code(obj):
+    """
+    Checks if `obj` has an `im_func` attribute containing its own `func_code`
+
+    Checking for im_func alone is not correct, because on Jython,
+    `reflectedfunction`s have an im_func attribute without func_code.
+    """
+    return hasattr(obj, 'im_func') and hasattr(obj.im_func, 'func_code')
 
 def function( receiver ):
     """Get function-like callable object for given receiver
@@ -17 +26 @@
     if hasattr(receiver, '__call__'):
         # receiver is a class instance; assume it is callable.
         # Reassign receiver to the actual method that will be called.
-        if hasattr( receiver.__call__, 'im_func') or hasattr( receiver.__call__, 'im_code'):
+        if _has_im_func_code(receiver.__call__) \
+               or hasattr(receiver.__call__, 'im_code'):
             receiver = receiver.__call__
-    if hasattr( receiver, 'im_func' ):
+    if _has_im_func_code(receiver):
         # an instance-method...
         return receiver, receiver.im_func.func_code, 1
     elif not hasattr( receiver, 'func_code'):
@@ -39 +49 @@
                 )
             )
     if not (codeObject.co_flags & 8):
-        # fc does not have a **kwds type parameter, therefore 
+        # fc does not have a **kwds type parameter, therefore
         # remove unacceptable arguments.
         for arg in named.keys():
             if arg not in acceptable: