svn commit: r1739204 - in /pig/trunk: CHANGES.txt ivy/libraries.properties src/org/apache/pig/scripting/jython/JythonFunction.java

[da...@apache.org]

Author: daijy
Date: Thu Apr 14 22:50:36 2016
New Revision: 1739204

URL: http://svn.apache.org/viewvc?rev=1739204&view=rev
Log:
PIG-4547: Update Jython version to 2.7.0

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/ivy/libraries.properties
    pig/trunk/src/org/apache/pig/scripting/jython/JythonFunction.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1739204&r1=1739203&r2=1739204&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Apr 14 22:50:36 2016
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
 
 IMPROVEMENTS
 
+PIG-4547: Update Jython version to 2.7.0 (erwaman via daijy)
+
 PIG-4862: POProject slow by creating StackTrace repeatedly (knoguchi)
 
 PIG-4853: Fetch inputs before starting outputs (rohini)

Modified: pig/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1739204&r1=1739203&r2=1739204&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Thu Apr 14 22:50:36 2016
@@ -66,7 +66,7 @@ jopt.version=4.1
 json-simple.version=1.1
 junit.version=4.11
 jruby.version=1.6.7
-jython.version=2.5.3
+jython.version=2.7.0
 kryo.version=2.22
 rhino.version=1.7R2
 antlr.version=3.4

Modified: pig/trunk/src/org/apache/pig/scripting/jython/JythonFunction.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/scripting/jython/JythonFunction.java?rev=1739204&r1=1739203&r2=1739204&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/scripting/jython/JythonFunction.java (original)
+++ pig/trunk/src/org/apache/pig/scripting/jython/JythonFunction.java Thu Apr 14 22:50:36 2016
@@ -54,7 +54,7 @@ public class JythonFunction extends Eval
         try {
             f = JythonScriptEngine.getFunction(filename, functionName);
             this.function = f;
-            num_parameters = ((PyBaseCode) f.func_code).co_argcount;
+            num_parameters = ((PyBaseCode) f.__code__).co_argcount;
             PyObject outputSchemaDef = f.__findattr__("outputSchema".intern());
             if (outputSchemaDef != null) {
                 this.schema = Utils.getSchemaFromString(outputSchemaDef.toString());
@@ -105,7 +105,7 @@ public class JythonFunction extends Eval
     @Override
     public Object exec(Tuple tuple) throws IOException {
         try {
-            if (tuple == null || (num_parameters == 0 && !((PyTableCode)function.func_code).varargs)) {
+            if (tuple == null || (num_parameters == 0 && !((PyTableCode)function.__code__).varargs)) {
                 // ignore input tuple
                 PyObject out = function.__call__();
                 return JythonUtils.pythonToPig(out);