[Jython-checkins] jython: #1905 Use jnr.constants instead of com.kenai.constantine.
frank.wierzbicki
jython-checkins at python.org
Tue Jan 29 20:25:42 CET 2013
http://hg.python.org/jython/rev/733258115a8a
changeset: 6963:733258115a8a
user: Frank Wierzbicki <fwierzbicki at gmail.com>
date: Tue Jan 29 11:25:27 2013 -0800
summary:
#1905 Use jnr.constants instead of com.kenai.constantine.
Thanks Arfrever!
files:
.classpath | 1 -
.idea/libraries/extlibs.xml | 1 -
.idea/libraries/extlibs2.xml | 1 -
ACKNOWLEDGMENTS | 1 +
b/.idea/libraries/extlibs.xml | 3 +-
build.xml | 3 -
extlibs/constantine.jar | Bin
src/org/python/core/Py.java | 22 +++------
src/org/python/core/io/FileIO.java | 4 +-
src/org/python/core/io/IOBase.java | 4 +-
src/org/python/core/io/ServerSocketIO.java | 4 +-
src/org/python/modules/_io/PyFileIO.java | 2 +-
src/org/python/modules/_py_compile.java | 2 +-
src/org/python/modules/cStringIO.java | 1 -
src/org/python/modules/errno.java | 18 ++++----
src/org/python/modules/posix/PosixModule.java | 8 +-
src/org/python/util/JLineConsole.java | 2 +-
17 files changed, 31 insertions(+), 46 deletions(-)
diff --git a/.classpath b/.classpath
--- a/.classpath
+++ b/.classpath
@@ -18,7 +18,6 @@
<classpathentry kind="lib" path="extlibs/asm-util-4.0.jar"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="lib" path="extlibs/antlr-runtime-3.1.3.jar"/>
- <classpathentry kind="lib" path="extlibs/constantine.jar"/>
<classpathentry kind="lib" path="extlibs/mockrunner-0.4.1/jar/jdom.jar"/>
<classpathentry kind="lib" path="extlibs/mockrunner-0.4.1/lib/jdk1.5/j2ee1.3/mockrunner-servlet.jar"/>
<classpathentry kind="lib" path="extlibs/livetribe-jsr223-2.0.5.jar"/>
diff --git a/.idea/libraries/extlibs.xml b/.idea/libraries/extlibs.xml
--- a/.idea/libraries/extlibs.xml
+++ b/.idea/libraries/extlibs.xml
@@ -8,7 +8,6 @@
<root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-Windows.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/livetribe-jsr223-2.0.5.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-FreeBSD.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/constantine.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/antlr-3.1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-Darwin.jar!/" />
diff --git a/.idea/libraries/extlibs2.xml b/.idea/libraries/extlibs2.xml
--- a/.idea/libraries/extlibs2.xml
+++ b/.idea/libraries/extlibs2.xml
@@ -9,7 +9,6 @@
<root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-Windows.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/livetribe-jsr223-2.0.5.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-FreeBSD.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/constantine.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/antlr-3.1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-Darwin.jar!/" />
diff --git a/ACKNOWLEDGMENTS b/ACKNOWLEDGMENTS
--- a/ACKNOWLEDGMENTS
+++ b/ACKNOWLEDGMENTS
@@ -97,6 +97,7 @@
Miki Tebeka
Jeff Allen
Julian Kennedy
+ Arfrever Frehtes Taifersar Arahesis
Local Variables:
mode: indented-text
diff --git a/b/.idea/libraries/extlibs.xml b/b/.idea/libraries/extlibs.xml
--- a/b/.idea/libraries/extlibs.xml
+++ b/b/.idea/libraries/extlibs.xml
@@ -8,7 +8,6 @@
<root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-Windows.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/livetribe-jsr223-2.0.5.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-FreeBSD.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/constantine.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/antlr-3.1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-Darwin.jar!/" />
@@ -45,4 +44,4 @@
<JAVADOC />
<SOURCES />
</library>
-</component>
\ No newline at end of file
+</component>
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -198,7 +198,6 @@
<pathelement path="${extlibs.dir}/asm-4.0.jar" />
<pathelement path="${extlibs.dir}/asm-commons-4.0.jar" />
<pathelement path="${extlibs.dir}/asm-util-4.0.jar" />
- <pathelement path="${extlibs.dir}/constantine.jar" />
<pathelement path="${extlibs.dir}/guava-11.0.2.jar" />
<pathelement path="${extlibs.dir}/jaffl.jar"/>
<pathelement path="${extlibs.dir}/jffi-Darwin.jar"/>
@@ -668,7 +667,6 @@
<zipfileset src="${extlibs.dir}/jnr-netdb-1.0.6-SNAPSHOT.jar"/>
<zipfileset src="${extlibs.dir}/jnr-posix-2.1-SNAPSHOT.jar"/>
<zipfileset src="${extlibs.dir}/jnr-constants-0.8.3-SNAPSHOT.jar"/>
- <!-- <rule pattern="com.kenai.constantine.**" result="org.python.constantine. at 1"/> -->
<zipfileset src="extlibs/xercesImpl-2.9.1.jar" excludes="META-INF/services/*"/>
<rule pattern="org.apache.xml.**" result="org.python.apache.xml. at 1"/>
<rule pattern="org.apache.xerces.**" result="org.python.apache.xerces. at 1"/>
@@ -942,7 +940,6 @@
<exclude name="extlibs/svnant-jars/**" />
<exclude name="extlibs/antlr*.jar" />
<exclude name="extlibs/asm*.jar" />
- <exclude name="extlibs/constantine*.jar" />
<exclude name="extlibs/jarjar*.jar" />
<exclude name="extlibs/junit*.jar" />
<exclude name="extlibs/servlet-api*.jar" />
diff --git a/extlibs/constantine.jar b/extlibs/constantine.jar
deleted file mode 100644
Binary file extlibs/constantine.jar has changed
diff --git a/src/org/python/core/Py.java b/src/org/python/core/Py.java
--- a/src/org/python/core/Py.java
+++ b/src/org/python/core/Py.java
@@ -21,8 +21,8 @@
import java.util.Set;
import org.python.antlr.base.mod;
-import com.kenai.constantine.Constant;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.Constant;
+import jnr.constants.platform.Errno;
import java.util.ArrayList;
import java.util.List;
import org.python.core.adapter.ClassicPyObjectAdapter;
@@ -117,22 +117,14 @@
}
public static PyException OSError(Constant errno) {
- int value = errno.value();
+ int value = errno.intValue();
PyObject args = new PyTuple(Py.newInteger(value), PosixModule.strerror(value));
return new PyException(Py.OSError, args);
}
public static PyException OSError(Constant errno, PyObject filename) {
- int value = errno.value();
- // Pass to strerror because constantine currently lacks Errno descriptions on
- // Windows, and strerror falls back to Linux's
- PyObject args = new PyTuple(Py.newInteger(value), PosixModule.strerror(value), filename);
- return new PyException(Py.OSError, args);
- }
-
- public static PyException OSError(jnr.constants.Constant errno, PyObject filename) {
int value = errno.intValue();
- // Pass to strerror because constantine currently lacks Errno descriptions on
+ // Pass to strerror because jnr-constants currently lacks Errno descriptions on
// Windows, and strerror falls back to Linux's
PyObject args = new PyTuple(Py.newInteger(value), PosixModule.strerror(value), filename);
return new PyException(Py.OSError, args);
@@ -191,13 +183,13 @@
}
public static PyException IOError(Constant errno) {
- int value = errno.value();
+ int value = errno.intValue();
PyObject args = new PyTuple(Py.newInteger(value), PosixModule.strerror(value));
return new PyException(Py.IOError, args);
}
public static PyException IOError(Constant errno, PyObject filename) {
- int value = errno.value();
+ int value = errno.intValue();
PyObject args = new PyTuple(Py.newInteger(value), PosixModule.strerror(value), filename);
return new PyException(Py.IOError, args);
}
@@ -208,7 +200,7 @@
message = ioe.getClass().getName();
}
if (ioe instanceof FileNotFoundException) {
- PyTuple args = new PyTuple(Py.newInteger(Errno.ENOENT.value()),
+ PyTuple args = new PyTuple(Py.newInteger(Errno.ENOENT.intValue()),
Py.newString("File not found - " + message));
return new PyException(err, args);
}
diff --git a/src/org/python/core/io/FileIO.java b/src/org/python/core/io/FileIO.java
--- a/src/org/python/core/io/FileIO.java
+++ b/src/org/python/core/io/FileIO.java
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 Jython Developers */
+/* Copyright (c) 2007-2012 Jython Developers */
package org.python.core.io;
import java.io.File;
@@ -12,7 +12,7 @@
import java.nio.channels.Channels;
import java.nio.channels.FileChannel;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
import jnr.posix.util.Platform;
import org.python.core.Py;
import org.python.core.PyString;
diff --git a/src/org/python/core/io/IOBase.java b/src/org/python/core/io/IOBase.java
--- a/src/org/python/core/io/IOBase.java
+++ b/src/org/python/core/io/IOBase.java
@@ -1,7 +1,7 @@
-/* Copyright (c) 2007 Jython Developers */
+/* Copyright (c) 2007-2012 Jython Developers */
package org.python.core.io;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/src/org/python/core/io/ServerSocketIO.java b/src/org/python/core/io/ServerSocketIO.java
--- a/src/org/python/core/io/ServerSocketIO.java
+++ b/src/org/python/core/io/ServerSocketIO.java
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007 Jython Developers */
+/* Copyright (c) 2007-2012 Jython Developers */
package org.python.core.io;
import java.nio.ByteBuffer;
import java.nio.channels.ServerSocketChannel;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
import org.python.core.Py;
/**
diff --git a/src/org/python/modules/_io/PyFileIO.java b/src/org/python/modules/_io/PyFileIO.java
--- a/src/org/python/modules/_io/PyFileIO.java
+++ b/src/org/python/modules/_io/PyFileIO.java
@@ -32,7 +32,7 @@
import org.python.expose.ExposedSet;
import org.python.expose.ExposedType;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
@ExposedType(name = "_io.FileIO", base = PyRawIOBase.class)
public class PyFileIO extends PyRawIOBase {
diff --git a/src/org/python/modules/_py_compile.java b/src/org/python/modules/_py_compile.java
--- a/src/org/python/modules/_py_compile.java
+++ b/src/org/python/modules/_py_compile.java
@@ -3,7 +3,7 @@
import java.io.File;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
import org.python.core.Py;
import org.python.core.PyList;
import org.python.core.PyString;
diff --git a/src/org/python/modules/cStringIO.java b/src/org/python/modules/cStringIO.java
--- a/src/org/python/modules/cStringIO.java
+++ b/src/org/python/modules/cStringIO.java
@@ -11,7 +11,6 @@
package org.python.modules;
-import com.kenai.constantine.platform.Errno;
import org.python.core.Py;
import org.python.core.PyIterator;
import org.python.core.PyList;
diff --git a/src/org/python/modules/errno.java b/src/org/python/modules/errno.java
--- a/src/org/python/modules/errno.java
+++ b/src/org/python/modules/errno.java
@@ -1,9 +1,9 @@
/* Copyright (c) Jython Developers */
package org.python.modules;
-import com.kenai.constantine.Constant;
-import com.kenai.constantine.ConstantSet;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.Constant;
+import jnr.constants.ConstantSet;
+import jnr.constants.platform.Errno;
import jnr.posix.util.Platform;
import org.python.core.ClassDictInit;
import org.python.core.Py;
@@ -16,7 +16,7 @@
* The Python errno module.
*
* Errno constants can be accessed from Java code via
- * {@link com.kenai.constantine.platform.Errno}, e.g. Errno.ENOENT.
+ * {@link jnr.constants.platform.Errno}, e.g. Errno.ENOENT.
*/
public class errno implements ClassDictInit {
@@ -61,7 +61,7 @@
// WSA errnos (and other Windows LastErrors)
ConstantSet lastErrors = ConstantSet.getConstantSet("LastError");
- // Fill the gaps by searching through every possible constantine Errno first
+ // Fill the gaps by searching through every possible jnr-constants Errno first
// checking if it's defined on Windows, then falling back to the WSA prefixed
// version if it exists
Constant constant;
@@ -69,20 +69,20 @@
String errnoName = errno.name();
if ((constant = winErrnos.getConstant(errnoName)) != null
|| (constant = lastErrors.getConstant("WSA" + errnoName)) != null) {
- addCode(dict, errnoName, constant.value(), constant.toString());
+ addCode(dict, errnoName, constant.intValue(), constant.toString());
}
}
// Then provide the WSA names
for (Constant lastError : lastErrors) {
if (lastError.name().startsWith("WSA")) {
- addCode(dict, lastError.name(), lastError.value(), lastError.toString());
+ addCode(dict, lastError.name(), lastError.intValue(), lastError.toString());
}
}
}
private static void initPosix(PyObject dict) {
for (Constant constant : ConstantSet.getConstantSet("Errno")) {
- addCode(dict, constant.name(), constant.value(), constant.toString());
+ addCode(dict, constant.name(), constant.intValue(), constant.toString());
}
}
@@ -94,7 +94,7 @@
}
/**
- * @deprecated Use org.python.core.constantine.Errno.valueOf(code).toString() (or
+ * @deprecated Use jnr.constants.platform.Errno.valueOf(code).toString() (or
* os.strerror from Python) instead.
*/
@Deprecated
diff --git a/src/org/python/modules/posix/PosixModule.java b/src/org/python/modules/posix/PosixModule.java
--- a/src/org/python/modules/posix/PosixModule.java
+++ b/src/org/python/modules/posix/PosixModule.java
@@ -1,8 +1,8 @@
/* Copyright (c) Jython Developers */
package org.python.modules.posix;
-import com.kenai.constantine.Constant;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.Constant;
+import jnr.constants.platform.Errno;
import java.io.File;
import java.io.FileDescriptor;
@@ -688,8 +688,8 @@
}
if (errno.name() == errno.toString()) {
// Fake constant or just lacks a description, fallback to Linux's
- // XXX: have constantine handle this fallback
- errno = Enum.valueOf(com.kenai.constantine.platform.linux.Errno.class,
+ // XXX: have jnr-constants handle this fallback
+ errno = Enum.valueOf(jnr.constants.platform.linux.Errno.class,
errno.name());
}
return new PyString(errno.toString());
diff --git a/src/org/python/util/JLineConsole.java b/src/org/python/util/JLineConsole.java
--- a/src/org/python/util/JLineConsole.java
+++ b/src/org/python/util/JLineConsole.java
@@ -13,7 +13,7 @@
import java.util.Arrays;
import java.util.List;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
import jline.ConsoleReader;
import jline.Terminal;
--
Repository URL: http://hg.python.org/jython
More information about the Jython-checkins
mailing list