[Jython-checkins] SF.net SVN: jython:[6849] trunk/jython/src/org/python/core/PyFunction.java

[<pj...@us...>]

Revision: 6849
          http://jython.svn.sourceforge.net/jython/?rev=6849&view=rev
Author:   pjenvey
Date:     2009-10-09 03:17:04 +0000 (Fri, 09 Oct 2009)

Log Message:
-----------
rearrange/cleanup by exposing __call__ with ThreadState

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyFunction.java

Modified: trunk/jython/src/org/python/core/PyFunction.java
===================================================================
--- trunk/jython/src/org/python/core/PyFunction.java	2009-10-08 03:30:17 UTC (rev 6848)
+++ trunk/jython/src/org/python/core/PyFunction.java	2009-10-09 03:17:04 UTC (rev 6849)
@@ -348,7 +348,8 @@
     @Override
     public PyObject __call__(ThreadState state, PyObject arg0, PyObject arg1,
             PyObject arg2, PyObject arg3) {
-        return func_code.call(state, arg0, arg1, arg2, arg3, func_globals, func_defaults, func_closure);
+        return func_code.call(state, arg0, arg1, arg2, arg3, func_globals, func_defaults,
+                              func_closure);
     }
     
     @Override
@@ -363,17 +364,17 @@
 
     @Override
     public PyObject __call__(PyObject[] args, String[] keywords) {
-        return function___call__(args, keywords);
+        return __call__(Py.getThreadState(), args, keywords);
     }
     
     @Override
     public PyObject __call__(ThreadState state, PyObject[] args, String[] keywords) {
-        return func_code.call(state, args, keywords, func_globals, func_defaults, func_closure);
+        return function___call__(state, args, keywords);
     }
 
     @ExposedMethod(doc = BuiltinDocs.function___call___doc)
-    final PyObject function___call__(PyObject[] args, String[] keywords) {
-        return __call__(Py.getThreadState(), args, keywords);
+    final PyObject function___call__(ThreadState state, PyObject[] args, String[] keywords) {
+        return func_code.call(state, args, keywords, func_globals, func_defaults, func_closure);
     }
 
     @Override
@@ -382,8 +383,10 @@
     }
     
     @Override
-    public PyObject __call__(ThreadState state, PyObject arg1, PyObject[] args, String[] keywords) {
-        return func_code.call(state, arg1, args, keywords, func_globals, func_defaults, func_closure);
+    public PyObject __call__(ThreadState state, PyObject arg1, PyObject[] args,
+                             String[] keywords) {
+        return func_code.call(state, arg1, args, keywords, func_globals, func_defaults,
+                              func_closure);
     }
 
     @Override


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.