[Jython-checkins] SF.net SVN: jython:[7034] trunk/jython

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

Revision: 7034
          http://jython.svn.sourceforge.net/jython/?rev=7034&view=rev
Author:   pjenvey
Date:     2010-04-18 00:59:01 +0000 (Sun, 18 Apr 2010)

Log Message:
-----------
update to jffi-1.0.1/jaffl-0.5.1/jnr-posix-1.1.4-79b6c76/constantine-0.7

Modified Paths:
--------------
    trunk/jython/build.xml
    trunk/jython/extlibs/constantine.jar
    trunk/jython/extlibs/jaffl.jar
    trunk/jython/extlibs/jffi-Darwin.jar
    trunk/jython/extlibs/jffi-i386-FreeBSD.jar
    trunk/jython/extlibs/jffi-i386-Linux.jar
    trunk/jython/extlibs/jffi-i386-SunOS.jar
    trunk/jython/extlibs/jffi-i386-Windows.jar
    trunk/jython/extlibs/jffi-ppc-AIX.jar
    trunk/jython/extlibs/jffi-s390x-Linux.jar
    trunk/jython/extlibs/jffi-sparc-SunOS.jar
    trunk/jython/extlibs/jffi-sparcv9-SunOS.jar
    trunk/jython/extlibs/jffi-x86_64-FreeBSD.jar
    trunk/jython/extlibs/jffi-x86_64-Linux.jar
    trunk/jython/extlibs/jffi-x86_64-SunOS.jar
    trunk/jython/extlibs/jffi.jar
    trunk/jython/extlibs/jnr-posix.jar
    trunk/jython/src/org/python/modules/posix/PosixModule.java
    trunk/jython/src/org/python/modules/posix/PythonPOSIXHandler.java

Added Paths:
-----------
    trunk/jython/extlibs/jffi-ppc-Linux.jar
    trunk/jython/extlibs/jffi-ppc64-Linux.jar
    trunk/jython/extlibs/jffi-x86_64-Windows.jar

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2010-04-17 19:35:37 UTC (rev 7033)
+++ trunk/jython/build.xml	2010-04-18 00:59:01 UTC (rev 7034)
@@ -196,6 +196,8 @@
             <pathelement path="${extlibs.dir}/jffi-i386-SunOS.jar"/>
             <pathelement path="${extlibs.dir}/jffi-i386-Windows.jar"/>
             <pathelement path="${extlibs.dir}/jffi-ppc-AIX.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-ppc-Linux.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-ppc64-Linux.jar"/>
             <pathelement path="${extlibs.dir}/jffi-s390x-Linux.jar"/>
             <pathelement path="${extlibs.dir}/jffi-sparc-SunOS.jar"/>
             <pathelement path="${extlibs.dir}/jffi-sparcv9-SunOS.jar"/>
@@ -203,6 +205,7 @@
             <pathelement path="${extlibs.dir}/jffi-x86_64-Linux.jar"/>
             <pathelement path="${extlibs.dir}/jffi-x86_64-OpenBSD.jar"/>
             <pathelement path="${extlibs.dir}/jffi-x86_64-SunOS.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-x86_64-Windows.jar"/>
             <pathelement path="${extlibs.dir}/jffi.jar"/>
             <pathelement path="${extlibs.dir}/jnr-posix.jar"/>
             <pathelement path="${extlibs.dir}/jnr-netdb-0.4.jar"/>
@@ -589,6 +592,8 @@
             <zipfileset src="extlibs/jffi-i386-SunOS.jar"/>
             <zipfileset src="extlibs/jffi-i386-Windows.jar"/>
             <zipfileset src="extlibs/jffi-ppc-AIX.jar"/>
+            <zipfileset src="extlibs/jffi-ppc-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-ppc64-Linux.jar"/>
             <zipfileset src="extlibs/jffi-s390x-Linux.jar"/>
             <zipfileset src="extlibs/jffi-sparc-SunOS.jar"/>
             <zipfileset src="extlibs/jffi-sparcv9-SunOS.jar"/>
@@ -596,6 +601,7 @@
             <zipfileset src="extlibs/jffi-x86_64-Linux.jar"/>
             <zipfileset src="extlibs/jffi-x86_64-OpenBSD.jar"/>
             <zipfileset src="extlibs/jffi-x86_64-SunOS.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-Windows.jar"/>
             <zipfileset src="extlibs/jffi.jar"/>
             <zipfileset src="extlibs/jnr-posix.jar"/>
             <zipfileset src="extlibs/jnr-netdb-0.4.jar"/>

Modified: trunk/jython/extlibs/constantine.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jaffl.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-Darwin.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-i386-FreeBSD.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-i386-Linux.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-i386-SunOS.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-i386-Windows.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-ppc-AIX.jar
===================================================================
(Binary files differ)

Added: trunk/jython/extlibs/jffi-ppc-Linux.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jython/extlibs/jffi-ppc-Linux.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/jython/extlibs/jffi-ppc64-Linux.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jython/extlibs/jffi-ppc64-Linux.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/jython/extlibs/jffi-s390x-Linux.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-sparc-SunOS.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-sparcv9-SunOS.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-x86_64-FreeBSD.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-x86_64-Linux.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jffi-x86_64-SunOS.jar
===================================================================
(Binary files differ)

Added: trunk/jython/extlibs/jffi-x86_64-Windows.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jython/extlibs/jffi-x86_64-Windows.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/jython/extlibs/jffi.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/extlibs/jnr-posix.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/src/org/python/modules/posix/PosixModule.java
===================================================================
--- trunk/jython/src/org/python/modules/posix/PosixModule.java	2010-04-17 19:35:37 UTC (rev 7033)
+++ trunk/jython/src/org/python/modules/posix/PosixModule.java	2010-04-18 00:59:01 UTC (rev 7034)
@@ -18,7 +18,6 @@
 import java.util.Map;
 
 import org.jruby.ext.posix.FileStat;
-import org.jruby.ext.posix.JavaPOSIX;
 import org.jruby.ext.posix.POSIX;
 import org.jruby.ext.posix.POSIXFactory;
 import org.jruby.ext.posix.util.Platform;
@@ -104,7 +103,7 @@
         // Successful termination
         dict.__setitem__("EX_OK", Py.Zero);
 
-        boolean nativePosix = !(posix instanceof JavaPOSIX);
+        boolean nativePosix = posix.isNative();
         dict.__setitem__("_native_posix", Py.newBoolean(nativePosix));
         dict.__setitem__("_posix_impl", Py.java2py(posix));
         dict.__setitem__("environ", getEnviron());

Modified: trunk/jython/src/org/python/modules/posix/PythonPOSIXHandler.java
===================================================================
--- trunk/jython/src/org/python/modules/posix/PythonPOSIXHandler.java	2010-04-17 19:35:37 UTC (rev 7033)
+++ trunk/jython/src/org/python/modules/posix/PythonPOSIXHandler.java	2010-04-18 00:59:01 UTC (rev 7034)
@@ -1,8 +1,7 @@
 /* Copyright (c) Jython Developers */
 package org.python.modules.posix;
 
-import com.kenai.constantine.Constant;
-import com.kenai.constantine.ConstantSet;
+import com.kenai.constantine.platform.Errno;
 
 import java.io.File;
 import java.io.InputStream;
@@ -21,14 +20,8 @@
  */
 public class PythonPOSIXHandler implements POSIXHandler {
 
-    private ConstantSet errnos = ConstantSet.getConstantSet("Errno");
-
-    public void error(POSIX.ERRORS error, String extraData) {
-        Constant errno = errnos.getConstant(error.name());
-        if (errno == null) {
-            throw Py.OSError(extraData);
-        }
-        throw Py.OSError(errno, extraData);
+    public void error(Errno error, String extraData) {
+        throw Py.OSError(error, extraData);
     }
 
     public void unimplementedError(String methodName) {


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