[Jython-checkins] jython: Implement _io._RawIOBase in Java
jeff.allen
jython-checkins at python.org
Sun Dec 9 21:29:42 CET 2012
http://hg.python.org/jython/rev/3782427e3a6d
changeset: 6894:3782427e3a6d
user: Jeff Allen <ja...py at farowl.co.uk>
date: Sat Dec 08 18:02:19 2012 +0000
summary:
Implement _io._RawIOBase in Java
There is now an implementation in org.python.modules._io.PyRawIOBase.java. Score in test_io.py is unchanged at fail/error/skip = 12/58/99.
files:
CoreExposed.includes | 1 +
Lib/_jyio.py | 66 +-
src/org/python/modules/_io/PyRawIOBase.java | 206 +
src/org/python/modules/_io/PyRawIOBaseDerived.java | 1583 ++++++++++
src/org/python/modules/_io/_io.java | 1 +
src/templates/_io._RawIOBase.derived | 39 +
src/templates/mappings | 3 +-
7 files changed, 1833 insertions(+), 66 deletions(-)
diff --git a/CoreExposed.includes b/CoreExposed.includes
--- a/CoreExposed.includes
+++ b/CoreExposed.includes
@@ -60,6 +60,7 @@
org/python/modules/_csv/PyReader.class
org/python/modules/_csv/PyWriter.class
org/python/modules/_io/PyIOBase.class
+org/python/modules/_io/PyRawIOBase.class
org/python/modules/_io/PyFileIO.class
org/python/modules/_functools/PyPartial.class
org/python/modules/_hashlib$Hash.class
diff --git a/Lib/_jyio.py b/Lib/_jyio.py
--- a/Lib/_jyio.py
+++ b/Lib/_jyio.py
@@ -57,71 +57,7 @@
self.characters_written = characters_written
-from _io import (open, UnsupportedOperation, _IOBase)
-
-
-class _RawIOBase(_IOBase):
-
- """Base class for raw binary I/O."""
-
- # The read() method is implemented by calling readinto(); derived
- # classes that want to support read() only need to implement
- # readinto() as a primitive operation. In general, readinto() can be
- # more efficient than read().
-
- # (It would be tempting to also provide an implementation of
- # readinto() in terms of read(), in case the latter is a more suitable
- # primitive operation, but that would lead to nasty recursion in case
- # a subclass doesn't implement either.)
-
- def read(self, n=-1):
- """Read and return up to n bytes.
-
- Returns an empty bytes object on EOF, or None if the object is
- set not to block and has no data to read.
- """
- if n is None:
- n = -1
- if n < 0:
- return self.readall()
- b = bytearray(n.__index__())
- n = self.readinto(b)
- if n is None:
- return None
- del b[n:]
- return bytes(b)
-
- def readall(self):
- """Read until EOF, using multiple read() call."""
- res = bytearray()
- while True:
- data = self.read(DEFAULT_BUFFER_SIZE)
- if not data:
- break
- res += data
- if res:
- return bytes(res)
- else:
- # b'' or None
- return data
-
- def readinto(self, b):
- """Read up to len(b) bytes into b.
-
- Returns number of bytes read (0 for EOF), or None if the object
- is set not to block and has no data to read.
- """
- self._unsupported("readinto")
-
- def write(self, b):
- """Write the given buffer to the IO stream.
-
- Returns the number of bytes written, which may be less than len(b).
- """
- self._unsupported("write")
-
-
-from _io import FileIO
+from _io import (open, UnsupportedOperation, _IOBase, _RawIOBase, FileIO)
class _BufferedIOBase(_IOBase):
diff --git a/src/org/python/modules/_io/PyRawIOBase.java b/src/org/python/modules/_io/PyRawIOBase.java
new file mode 100644
--- /dev/null
+++ b/src/org/python/modules/_io/PyRawIOBase.java
@@ -0,0 +1,206 @@
+/* Copyright (c)2012 Jython Developers */
+package org.python.modules._io;
+
+import org.python.core.Py;
+import org.python.core.PyBUF;
+import org.python.core.PyBuffer;
+import org.python.core.PyByteArray;
+import org.python.core.PyList;
+import org.python.core.PyLong;
+import org.python.core.PyNewWrapper;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyType;
+import org.python.expose.ExposedMethod;
+import org.python.expose.ExposedNew;
+import org.python.expose.ExposedType;
+
+/**
+ * An implementation of Python <code>_io._RawIOBase</code> mirroring the arrangement of methods in
+ * the CPython version.
+ */
+ at ExposedType(name = "_io._RawIOBase", doc = PyRawIOBase.doc, base = PyIOBase.class)
+public class PyRawIOBase extends PyIOBase {
+
+ public static final PyType TYPE = PyType.fromClass(PyRawIOBase.class);
+
+ public PyRawIOBase() {
+ this(TYPE);
+ }
+
+ public PyRawIOBase(PyType subtype) {
+ super(subtype);
+ }
+
+ @ExposedNew
+ static PyObject _RawIOBase__new__(PyNewWrapper new_, boolean init, PyType subtype,
+ PyObject[] args, String[] keywords) {
+ if (new_.for_type == subtype) {
+ // We only want an _io._RawIOBase, so the constructor does it all
+ return new PyRawIOBase();
+ } else {
+ // We want some sub-class of it (in which __init__ will be called by the caller)
+ return new PyRawIOBaseDerived(subtype);
+ }
+ }
+
+ /**
+ * The read() method is implemented by calling readinto(); derived classes that want to support
+ * read() only need to implement readinto() as a primitive operation. In general, readinto() can
+ * be more efficient than read().
+ *
+ * @param n number of bytes to read (if possible)
+ * @return a PyString holding the bytes read or <code>Py.None</code> (when a non-blocking source
+ * is not ready with further data)
+ */
+ public PyObject read(int n) {
+ return _RawIOBase_read(n);
+ }
+
+ /*
+ * CPython comment: (It would be tempting to also provide an implementation of readinto() in
+ * terms of read(), in case the latter is a more suitable primitive operation, but that would
+ * lead to nasty recursion in case a subclass doesn't implement either.)
+ */
+ @ExposedMethod(defaults = "-1", doc = read_doc)
+ final PyObject _RawIOBase_read(int n) {
+
+ if (n < 0) {
+ // This is really a request to read the whole stream
+ return invoke("readall");
+
+ } else {
+ // Allocate a buffer big enough to satisfy the request
+ PyByteArray b = new PyByteArray(n);
+
+ // Read up to that much using the (possibly overridden) readinto() method
+ PyObject m = invoke("readinto", b);
+
+ if (m.isIndex()) {
+ // It returned the actual count of bytes read
+ int count = m.asIndex();
+ PyBuffer view = b.getBuffer(PyBUF.FULL_RO);
+ // We can forget view.release() as the bytearray b is garbage outside this method.
+
+ // Did we get all the bytes we expected?
+ if (count < n) {
+ // No, so swap the view for a slice of just the data we actually read.
+ view = view.getBufferSlice(PyBUF.FULL_RO, 0, count);
+ }
+
+ // Make a str from that view
+ return new PyString(view.toString());
+
+ } else {
+ // It must have returned None (signalling a vacuous read of non-blocking stream)
+ return m;
+ }
+
+ }
+ }
+
+ /**
+ * Read until end of file, using multiple <code>read()</code> operations on the underlying
+ * stream. If the first <code>read()</code> returns <code>None</code> (only possible in the case
+ * of a non-blocking stream), this method returns <code>None</code>.
+ *
+ * @return a PyString holding the bytes read or <code>Py.None</code> (when a non-blocking source
+ * is not ready with further data)
+ */
+ public PyObject readall() {
+ return _RawIOBase_readall();
+ }
+
+ @ExposedMethod(doc = readall_doc)
+ final synchronized PyObject _RawIOBase_readall() {
+
+ // Get reference to the (possibly overridden) read() method
+ PyObject readMethod = __getattr__("read");
+
+ // Quite often, a single read operation will do the trick
+ PyObject prev = readMethod.__call__(_io.DEFAULT_BUFFER_SIZE);
+
+ if (!prev.__nonzero__()) {
+ // Nothing on the first read: that means we're done
+ return prev;
+
+ } else {
+ // Try a second read
+ PyObject curr = readMethod.__call__(_io.DEFAULT_BUFFER_SIZE);
+ if (!curr.__nonzero__()) {
+ // Nothing on the second read: the result is just the first one
+ return prev;
+
+ } else {
+ // Remembering more than one thing is hard: we're going to need a list
+ PyList list = new PyList();
+ list.add(prev);
+
+ // Accumulate the current read result and get another, until we run out of bytes.
+ do {
+ list.add(curr);
+ curr = readMethod.__call__(_io.DEFAULT_BUFFER_SIZE);
+ } while (curr.__nonzero__());
+
+ // Stitch it all together
+ return Py.EmptyString.join(list);
+ }
+ }
+ }
+
+ /**
+ * Read up to <code>len(b)</code> bytes into <code>bytearray b</code> and return the number of
+ * bytes read. If the object is in non-blocking mode and no bytes are available,
+ * <code>None</code> is returned.";
+ *
+ * @param b byte array to try to fill
+ * @return number of bytes actually read or <code>Py.None</code> (when a non-blocking source is
+ * not ready with further data)
+ */
+ public PyObject readinto(PyObject b) {
+ return _RawIOBase_readinto(b);
+ }
+
+ @ExposedMethod(doc = readinto_doc)
+ final synchronized PyLong _RawIOBase_readinto(PyObject b) {
+ throw unsupported("readinto");
+ }
+
+ /**
+ * Write the given bytes or bytearray object to the underlying raw stream and return the number
+ * of bytes written.
+ *
+ * @param b buffer of bytes to be written
+ * @return
+ */
+ public PyObject write(PyObject b) {
+ return _RawIOBase_write(b);
+ }
+
+ @ExposedMethod(doc = write_doc)
+ final PyLong _RawIOBase_write(PyObject b) {
+ throw unsupported("write");
+ }
+
+ /*
+ * Documentation strings: public where they might be useful to a subclass.
+ */
+ public static final String read_doc = "Read up to n bytes from the object and return them.\n"
+ + "As a convenience, if n is unspecified or -1, readall() is called.";
+
+ public static final String readall_doc =
+ "Read and return all the bytes from the stream until EOF, using multiple\n"
+ + "calls to the stream if necessary.";
+
+ public static final String readinto_doc =
+ "Read up to len(b) bytes into bytearray b and return the number of bytes read.\n"
+ + "If the object is in non-blocking mode and no bytes are available,\n"
+ + "None is returned.";
+
+ public static final String write_doc =
+ "Write the given bytes or bytearray object, b, to the underlying raw\n"
+ + "stream and return the number of bytes written.";
+
+ static final String doc = "Base class for raw binary I/O.";
+
+}
diff --git a/src/org/python/modules/_io/PyRawIOBaseDerived.java b/src/org/python/modules/_io/PyRawIOBaseDerived.java
new file mode 100644
--- /dev/null
+++ b/src/org/python/modules/_io/PyRawIOBaseDerived.java
@@ -0,0 +1,1583 @@
+/* Generated file, do not modify. See jython/src/templates/gderived.py. */
+package org.python.modules._io;
+
+import java.io.Serializable;
+
+import org.python.core.Deriveds;
+import org.python.core.Py;
+import org.python.core.PyBoolean;
+import org.python.core.PyComplex;
+import org.python.core.PyException;
+import org.python.core.PyFloat;
+import org.python.core.PyInteger;
+import org.python.core.PyLong;
+import org.python.core.PyObject;
+import org.python.core.PySequenceIter;
+import org.python.core.PySlice;
+import org.python.core.PyString;
+import org.python.core.PyTuple;
+import org.python.core.PyType;
+import org.python.core.PyUnicode;
+import org.python.core.Slotted;
+import org.python.core.ThreadState;
+
+public class PyRawIOBaseDerived extends PyRawIOBase implements Slotted {
+
+ @Override
+ public PyObject getSlot(int index) {
+ return slots[index];
+ }
+
+ @Override
+ public void setSlot(int index, PyObject value) {
+ slots[index] = value;
+ }
+
+ private PyObject[] slots;
+
+ public PyRawIOBaseDerived(PyType subtype) {
+ super(subtype);
+ slots = new PyObject[subtype.getNumSlots()];
+ }
+
+ @Override
+ public PyString __str__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__str__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyString) {
+ return (PyString)res;
+ }
+ throw Py.TypeError("__str__" + " returned non-" + "string" + " (type "
+ + res.getType().fastGetName() + ")");
+ }
+ return super.__str__();
+ }
+
+ @Override
+ public PyString __repr__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__repr__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyString) {
+ return (PyString)res;
+ }
+ throw Py.TypeError("__repr__" + " returned non-" + "string" + " (type "
+ + res.getType().fastGetName() + ")");
+ }
+ return super.__repr__();
+ }
+
+ @Override
+ public PyString __hex__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__hex__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyString) {
+ return (PyString)res;
+ }
+ throw Py.TypeError("__hex__" + " returned non-" + "string" + " (type "
+ + res.getType().fastGetName() + ")");
+ }
+ return super.__hex__();
+ }
+
+ @Override
+ public PyString __oct__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__oct__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyString) {
+ return (PyString)res;
+ }
+ throw Py.TypeError("__oct__" + " returned non-" + "string" + " (type "
+ + res.getType().fastGetName() + ")");
+ }
+ return super.__oct__();
+ }
+
+ @Override
+ public PyFloat __float__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__float__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyFloat) {
+ return (PyFloat)res;
+ }
+ throw Py.TypeError("__float__" + " returned non-" + "float" + " (type "
+ + res.getType().fastGetName() + ")");
+ }
+ return super.__float__();
+ }
+
+ @Override
+ public PyComplex __complex__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__complex__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyComplex) {
+ return (PyComplex)res;
+ }
+ throw Py.TypeError("__complex__" + " returned non-" + "complex" + " (type "
+ + res.getType().fastGetName() + ")");
+ }
+ return super.__complex__();
+ }
+
+ @Override
+ public PyObject __pos__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__pos__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__();
+ }
+ return super.__pos__();
+ }
+
+ @Override
+ public PyObject __neg__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__neg__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__();
+ }
+ return super.__neg__();
+ }
+
+ @Override
+ public PyObject __abs__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__abs__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__();
+ }
+ return super.__abs__();
+ }
+
+ @Override
+ public PyObject __invert__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__invert__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__();
+ }
+ return super.__invert__();
+ }
+
+ @Override
+ public PyObject __reduce__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__reduce__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__();
+ }
+ return super.__reduce__();
+ }
+
+ @Override
+ public PyObject __dir__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__dir__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__();
+ }
+ return super.__dir__();
+ }
+
+ @Override
+ public PyObject __add__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__add__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__add__(other);
+ }
+
+ @Override
+ public PyObject __radd__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__radd__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__radd__(other);
+ }
+
+ @Override
+ public PyObject __sub__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__sub__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__sub__(other);
+ }
+
+ @Override
+ public PyObject __rsub__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rsub__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rsub__(other);
+ }
+
+ @Override
+ public PyObject __mul__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__mul__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__mul__(other);
+ }
+
+ @Override
+ public PyObject __rmul__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rmul__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rmul__(other);
+ }
+
+ @Override
+ public PyObject __div__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__div__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__div__(other);
+ }
+
+ @Override
+ public PyObject __rdiv__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rdiv__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rdiv__(other);
+ }
+
+ @Override
+ public PyObject __floordiv__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__floordiv__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__floordiv__(other);
+ }
+
+ @Override
+ public PyObject __rfloordiv__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rfloordiv__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rfloordiv__(other);
+ }
+
+ @Override
+ public PyObject __truediv__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__truediv__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__truediv__(other);
+ }
+
+ @Override
+ public PyObject __rtruediv__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rtruediv__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rtruediv__(other);
+ }
+
+ @Override
+ public PyObject __mod__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__mod__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__mod__(other);
+ }
+
+ @Override
+ public PyObject __rmod__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rmod__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rmod__(other);
+ }
+
+ @Override
+ public PyObject __divmod__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__divmod__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__divmod__(other);
+ }
+
+ @Override
+ public PyObject __rdivmod__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rdivmod__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rdivmod__(other);
+ }
+
+ @Override
+ public PyObject __rpow__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rpow__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rpow__(other);
+ }
+
+ @Override
+ public PyObject __lshift__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__lshift__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__lshift__(other);
+ }
+
+ @Override
+ public PyObject __rlshift__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rlshift__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rlshift__(other);
+ }
+
+ @Override
+ public PyObject __rshift__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rshift__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rshift__(other);
+ }
+
+ @Override
+ public PyObject __rrshift__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rrshift__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rrshift__(other);
+ }
+
+ @Override
+ public PyObject __and__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__and__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__and__(other);
+ }
+
+ @Override
+ public PyObject __rand__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rand__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rand__(other);
+ }
+
+ @Override
+ public PyObject __or__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__or__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__or__(other);
+ }
+
+ @Override
+ public PyObject __ror__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__ror__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__ror__(other);
+ }
+
+ @Override
+ public PyObject __xor__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__xor__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__xor__(other);
+ }
+
+ @Override
+ public PyObject __rxor__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__rxor__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__rxor__(other);
+ }
+
+ @Override
+ public PyObject __lt__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__lt__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__lt__(other);
+ }
+
+ @Override
+ public PyObject __le__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__le__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__le__(other);
+ }
+
+ @Override
+ public PyObject __gt__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__gt__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__gt__(other);
+ }
+
+ @Override
+ public PyObject __ge__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__ge__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__ge__(other);
+ }
+
+ @Override
+ public PyObject __eq__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__eq__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__eq__(other);
+ }
+
+ @Override
+ public PyObject __ne__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__ne__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__ne__(other);
+ }
+
+ @Override
+ public PyObject __format__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__format__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__format__(other);
+ }
+
+ @Override
+ public PyObject __iadd__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__iadd__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__iadd__(other);
+ }
+
+ @Override
+ public PyObject __isub__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__isub__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__isub__(other);
+ }
+
+ @Override
+ public PyObject __imul__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__imul__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__imul__(other);
+ }
+
+ @Override
+ public PyObject __idiv__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__idiv__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__idiv__(other);
+ }
+
+ @Override
+ public PyObject __ifloordiv__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__ifloordiv__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__ifloordiv__(other);
+ }
+
+ @Override
+ public PyObject __itruediv__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__itruediv__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__itruediv__(other);
+ }
+
+ @Override
+ public PyObject __imod__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__imod__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__imod__(other);
+ }
+
+ @Override
+ public PyObject __ipow__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__ipow__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__ipow__(other);
+ }
+
+ @Override
+ public PyObject __ilshift__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__ilshift__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__ilshift__(other);
+ }
+
+ @Override
+ public PyObject __irshift__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__irshift__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__irshift__(other);
+ }
+
+ @Override
+ public PyObject __iand__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__iand__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__iand__(other);
+ }
+
+ @Override
+ public PyObject __ior__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__ior__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__ior__(other);
+ }
+
+ @Override
+ public PyObject __ixor__(PyObject other) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__ixor__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__ixor__(other);
+ }
+
+ @Override
+ public PyObject __int__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__int__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyInteger || res instanceof PyLong) {
+ return res;
+ }
+ throw Py.TypeError("__int__" + " should return an integer");
+ }
+ return super.__int__();
+ }
+
+ @Override
+ public PyObject __long__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__long__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyLong || res instanceof PyInteger) {
+ return res;
+ }
+ throw Py.TypeError("__long__" + " returned non-" + "long" + " (type "
+ + res.getType().fastGetName() + ")");
+ }
+ return super.__long__();
+ }
+
+ @Override
+ public int hashCode() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__hash__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyInteger) {
+ return ((PyInteger)res).getValue();
+ } else if (res instanceof PyLong) {
+ return ((PyLong)res).getValue().intValue();
+ }
+ throw Py.TypeError("__hash__ should return a int");
+ }
+ if (self_type.lookup("__eq__") != null || self_type.lookup("__cmp__") != null) {
+ throw Py.TypeError(String.format("unhashable type: '%.200s'", getType().fastGetName()));
+ }
+ return super.hashCode();
+ }
+
+ @Override
+ public PyUnicode __unicode__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__unicode__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyUnicode) {
+ return (PyUnicode)res;
+ }
+ if (res instanceof PyString) {
+ return new PyUnicode((PyString)res);
+ }
+ throw Py.TypeError("__unicode__" + " should return a " + "unicode");
+ }
+ return super.__unicode__();
+ }
+
+ @Override
+ public int __cmp__(PyObject other) {
+ PyType self_type = getType();
+ PyObject[] where_type = new PyObject[1];
+ PyObject impl = self_type.lookup_where("__cmp__", where_type);
+ // Full Compatibility with CPython __cmp__:
+ // If the derived type don't override __cmp__, the
+ // *internal* super().__cmp__ should be called, not the
+ // exposed one. The difference is that the exposed __cmp__
+ // throws a TypeError if the argument is an instance of the same type.
+ if (impl == null || where_type[0] == TYPE || Py.isSubClass(TYPE, where_type[0])) {
+ return super.__cmp__(other);
+ }
+ PyObject res = impl.__get__(this, self_type).__call__(other);
+ if (res == Py.NotImplemented) {
+ return -2;
+ }
+ int c = res.asInt();
+ return c < 0 ? -1 : c > 0 ? 1 : 0;
+ }
+
+ @Override
+ public boolean __nonzero__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__nonzero__");
+ if (impl == null) {
+ impl = self_type.lookup("__len__");
+ if (impl == null) {
+ return super.__nonzero__();
+ }
+ }
+ PyObject o = impl.__get__(this, self_type).__call__();
+ Class c = o.getClass();
+ if (c != PyInteger.class && c != PyBoolean.class) {
+ throw Py.TypeError(String.format("__nonzero__ should return bool or int, returned %s",
+ self_type.getName()));
+ }
+ return o.__nonzero__();
+ }
+
+ @Override
+ public boolean __contains__(PyObject o) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__contains__");
+ if (impl == null) {
+ return super.__contains__(o);
+ }
+ return impl.__get__(this, self_type).__call__(o).__nonzero__();
+ }
+
+ @Override
+ public int __len__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__len__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyInteger) {
+ return ((PyInteger)res).getValue();
+ }
+ throw Py.TypeError("__len__ should return a int");
+ }
+ return super.__len__();
+ }
+
+ @Override
+ public PyObject __iter__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__iter__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__();
+ }
+ impl = self_type.lookup("__getitem__");
+ if (impl == null) {
+ return super.__iter__();
+ }
+ return new PySequenceIter(this);
+ }
+
+ @Override
+ public PyObject __iternext__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("next");
+ if (impl != null) {
+ try {
+ return impl.__get__(this, self_type).__call__();
+ } catch (PyException exc) {
+ if (exc.match(Py.StopIteration)) {
+ return null;
+ }
+ throw exc;
+ }
+ }
+ return super.__iternext__(); // ???
+ }
+
+ @Override
+ public PyObject __finditem__(PyObject key) { // ???
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__getitem__");
+ if (impl != null) {
+ try {
+ return impl.__get__(this, self_type).__call__(key);
+ } catch (PyException exc) {
+ if (exc.match(Py.LookupError)) {
+ return null;
+ }
+ throw exc;
+ }
+ }
+ return super.__finditem__(key);
+ }
+
+ @Override
+ public PyObject __finditem__(int key) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__getitem__");
+ if (impl != null) {
+ try {
+ return impl.__get__(this, self_type).__call__(new PyInteger(key));
+ } catch (PyException exc) {
+ if (exc.match(Py.LookupError)) {
+ return null;
+ }
+ throw exc;
+ }
+ }
+ return super.__finditem__(key);
+ }
+
+ @Override
+ public PyObject __getitem__(PyObject key) {
+ // Same as __finditem__, without swallowing LookupErrors. This allows
+ // __getitem__ implementations written in Python to raise custom
+ // exceptions (such as subclasses of KeyError).
+ //
+ // We are forced to duplicate the code, instead of defining __finditem__
+ // in terms of __getitem__. That's because PyObject defines __getitem__
+ // in terms of __finditem__. Therefore, we would end with an infinite
+ // loop when self_type.lookup("__getitem__") returns null:
+ //
+ // __getitem__ -> super.__getitem__ -> __finditem__ -> __getitem__
+ //
+ // By duplicating the (short) lookup and call code, we are safe, because
+ // the call chains will be:
+ //
+ // __finditem__ -> super.__finditem__
+ //
+ // __getitem__ -> super.__getitem__ -> __finditem__ -> super.__finditem__
+
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__getitem__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(key);
+ }
+ return super.__getitem__(key);
+ }
+
+ @Override
+ public void __setitem__(PyObject key, PyObject value) { // ???
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__setitem__");
+ if (impl != null) {
+ impl.__get__(this, self_type).__call__(key, value);
+ return;
+ }
+ super.__setitem__(key, value);
+ }
+
+ @Override
+ public PyObject __getslice__(PyObject start, PyObject stop, PyObject step) { // ???
+ if (step != null) {
+ return __getitem__(new PySlice(start, stop, step));
+ }
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__getslice__");
+ if (impl != null) {
+ PyObject[] indices = PySlice.indices2(this, start, stop);
+ return impl.__get__(this, self_type).__call__(indices[0], indices[1]);
+ }
+ return super.__getslice__(start, stop, step);
+ }
+
+ @Override
+ public void __setslice__(PyObject start, PyObject stop, PyObject step, PyObject value) {
+ if (step != null) {
+ __setitem__(new PySlice(start, stop, step), value);
+ return;
+ }
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__setslice__");
+ if (impl != null) {
+ PyObject[] indices = PySlice.indices2(this, start, stop);
+ impl.__get__(this, self_type).__call__(indices[0], indices[1], value);
+ return;
+ }
+ super.__setslice__(start, stop, step, value);
+ }
+
+ @Override
+ public void __delslice__(PyObject start, PyObject stop, PyObject step) {
+ if (step != null) {
+ __delitem__(new PySlice(start, stop, step));
+ return;
+ }
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__delslice__");
+ if (impl != null) {
+ PyObject[] indices = PySlice.indices2(this, start, stop);
+ impl.__get__(this, self_type).__call__(indices[0], indices[1]);
+ return;
+ }
+ super.__delslice__(start, stop, step);
+ }
+
+ @Override
+ public void __delitem__(PyObject key) { // ???
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__delitem__");
+ if (impl != null) {
+ impl.__get__(this, self_type).__call__(key);
+ return;
+ }
+ super.__delitem__(key);
+ }
+
+ @Override
+ public PyObject __call__(PyObject args[], String keywords[]) {
+ ThreadState ts = Py.getThreadState();
+ if (ts.recursion_depth++ > ts.systemState.getrecursionlimit()) {
+ throw Py.RuntimeError("maximum __call__ recursion depth exceeded");
+ }
+ try {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__call__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(args, keywords);
+ }
+ return super.__call__(args, keywords);
+ } finally {
+ --ts.recursion_depth;
+ }
+ }
+
+ @Override
+ public PyObject __findattr_ex__(String name) {
+ return Deriveds.__findattr_ex__(this, name);
+ }
+
+ @Override
+ public void __setattr__(String name, PyObject value) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__setattr__");
+ if (impl != null) {
+ impl.__get__(this, self_type).__call__(PyString.fromInterned(name), value);
+ return;
+ }
+ super.__setattr__(name, value);
+ }
+
+ @Override
+ public void __delattr__(String name) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__delattr__");
+ if (impl != null) {
+ impl.__get__(this, self_type).__call__(PyString.fromInterned(name));
+ return;
+ }
+ super.__delattr__(name);
+ }
+
+ @Override
+ public PyObject __get__(PyObject obj, PyObject type) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__get__");
+ if (impl != null) {
+ if (obj == null) {
+ obj = Py.None;
+ }
+ if (type == null) {
+ type = Py.None;
+ }
+ return impl.__get__(this, self_type).__call__(obj, type);
+ }
+ return super.__get__(obj, type);
+ }
+
+ @Override
+ public void __set__(PyObject obj, PyObject value) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__set__");
+ if (impl != null) {
+ impl.__get__(this, self_type).__call__(obj, value);
+ return;
+ }
+ super.__set__(obj, value);
+ }
+
+ @Override
+ public void __delete__(PyObject obj) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__delete__");
+ if (impl != null) {
+ impl.__get__(this, self_type).__call__(obj);
+ return;
+ }
+ super.__delete__(obj);
+ }
+
+ @Override
+ public PyObject __pow__(PyObject other, PyObject modulo) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__pow__");
+ if (impl != null) {
+ PyObject res;
+ if (modulo == null) {
+ res = impl.__get__(this, self_type).__call__(other);
+ } else {
+ res = impl.__get__(this, self_type).__call__(other, modulo);
+ }
+ if (res == Py.NotImplemented) {
+ return null;
+ }
+ return res;
+ }
+ return super.__pow__(other, modulo);
+ }
+
+ @Override
+ public void dispatch__init__(PyObject[] args, String[] keywords) {
+ Deriveds.dispatch__init__(this, args, keywords);
+ }
+
+ @Override
+ public PyObject __index__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__index__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__();
+ if (res instanceof PyInteger || res instanceof PyLong) {
+ return res;
+ }
+ throw Py.TypeError(String.format("__index__ returned non-(int,long) (type %s)", res
+ .getType().fastGetName()));
+ }
+ return super.__index__();
+ }
+
+ @Override
+ public Object __tojava__(Class c) {
+ // If we are not being asked by the "default" conversion to java, then
+ // we can provide this as the result, as long as it is a instance of the
+ // specified class. Without this, derived.__tojava__(PyObject.class)
+ // would broke. (And that's not pure speculation: PyReflectedFunction's
+ // ReflectedArgs asks for things like that).
+ if ((c != Object.class) && (c != Serializable.class) && (c.isInstance(this))) {
+ return this;
+ }
+ // Otherwise, we call the derived __tojava__, if it exists:
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__tojava__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(Py.java2py(c)).__tojava__(Object.class);
+ }
+ return super.__tojava__(c);
+ }
+
+ @Override
+ public Object __coerce_ex__(PyObject o) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__coerce__");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(o);
+ if (res == Py.NotImplemented) {
+ return Py.None;
+ }
+ if (!(res instanceof PyTuple)) {
+ throw Py.TypeError("__coerce__ didn't return a 2-tuple");
+ }
+ return ((PyTuple)res).getArray();
+ }
+ return super.__coerce_ex__(o);
+ }
+
+ @Override
+ public PyObject __enter__() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__enter__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__();
+ }
+ return super.__enter__();
+ }
+
+ @Override
+ public PyObject fileno() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("fileno");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__();
+ }
+ return super.fileno();
+ }
+
+ // Hand-crafted in _io._IOBase.derived
+
+ @Override
+ public long seek(long pos, int whence) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("seek");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(Py.newLong(pos), Py.newInteger(whence))
+ .asLong();
+ } else {
+ return super.seek(pos, whence);
+ }
+ }
+
+ @Override
+ public long tell() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("tell");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__().asLong();
+ } else {
+ return super.tell();
+ }
+ }
+
+ @Override
+ public long truncate(long size) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("truncate");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(Py.newLong(size)).asLong();
+ } else {
+ return super.truncate(size);
+ }
+ }
+
+ @Override
+ public long truncate() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("truncate");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__().asLong();
+ } else {
+ return super.truncate();
+ }
+ }
+
+ @Override
+ public void flush() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("flush");
+ if (impl != null) {
+ impl.__get__(this, self_type).__call__();
+ } else {
+ super.flush();
+ }
+ }
+
+ @Override
+ public void close() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("close");
+ if (impl != null) {
+ impl.__get__(this, self_type).__call__();
+ } else {
+ super.close();
+ }
+ }
+
+ @Override
+ public boolean seekable() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("seekable");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__().__nonzero__();
+ } else {
+ return super.seekable();
+ }
+ }
+
+ @Override
+ public void _checkSeekable(String msg) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("_checkSeekable");
+ if (impl != null) {
+ PyObject pymsg = msg == null ? Py.None : new PyString(msg);
+ impl.__get__(this, self_type).__call__(pymsg);
+ } else {
+ super._checkSeekable(msg);
+ }
+ }
+
+ @Override
+ public boolean readable() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("readable");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__().__nonzero__();
+ } else {
+ return super.readable();
+ }
+ }
+
+ @Override
+ public void _checkReadable(String msg) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("_checkReadable");
+ if (impl != null) {
+ PyObject pymsg = msg == null ? Py.None : new PyString(msg);
+ impl.__get__(this, self_type).__call__(pymsg);
+ } else {
+ super._checkReadable(msg);
+ }
+ }
+
+ @Override
+ public boolean writable() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("writable");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__().__nonzero__();
+ } else {
+ return super.writable();
+ }
+ }
+
+ @Override
+ public void _checkWritable(String msg) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("_checkWritable");
+ if (impl != null) {
+ PyObject pymsg = msg == null ? Py.None : new PyString(msg);
+ impl.__get__(this, self_type).__call__(pymsg);
+ } else {
+ super._checkWritable(msg);
+ }
+ }
+
+ // Note that closed is a property not a predicate, so no derived method.
+
+ @Override
+ public void _checkClosed(String msg) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("_checkClosed");
+ if (impl != null) {
+ PyObject pymsg = msg == null ? Py.None : new PyString(msg);
+ impl.__get__(this, self_type).__call__(pymsg);
+ } else {
+ super._checkClosed(msg);
+ }
+ }
+
+ @Override
+ public boolean __exit__(PyObject type, PyObject value, PyObject traceback) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("__exit__");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(type, value, traceback).__nonzero__();
+ } else {
+ return super.__exit__(type, value, traceback);
+ }
+ }
+
+ @Override
+ public boolean isatty() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("isatty");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__().__nonzero__();
+ } else {
+ return super.isatty();
+ }
+ }
+
+ @Override
+ public PyObject readline() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("readline");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(Py.None);
+ } else {
+ return super.readline();
+ }
+ }
+
+ @Override
+ public PyObject readline(int limit) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("readline");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(Py.newInteger(limit));
+ } else {
+ return super.readline(limit);
+ }
+ }
+
+ @Override
+ public PyObject readlines(PyObject hint) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("readlines");
+ if (impl != null) {
+ PyObject res = impl.__get__(this, self_type).__call__(hint);
+ return res;
+ } else {
+ return super.readlines(hint);
+ }
+ }
+
+ @Override
+ public void writelines(PyObject lines) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("writelines");
+ if (impl != null) {
+ impl.__get__(this, self_type).__call__(lines);
+ } else {
+ super.writelines(lines);
+ }
+ }
+
+ @Override
+ public PyObject readall() {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("readall");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__();
+ }
+ return super.readall();
+ }
+
+ // Hand-crafted in _io._RawIOBase.derived
+
+ @Override
+ public PyObject read(int n) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("read");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(Py.newInteger(n));
+ } else {
+ return super.read(n);
+ }
+ }
+
+ @Override
+ public PyObject readinto(PyObject b) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("readinto");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(b);
+ } else {
+ return super.readinto(b);
+ }
+ }
+
+ @Override
+ public PyObject write(PyObject b) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("write");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(b);
+ } else {
+ return super.write(b);
+ }
+ }
+
+}
diff --git a/src/org/python/modules/_io/_io.java b/src/org/python/modules/_io/_io.java
--- a/src/org/python/modules/_io/_io.java
+++ b/src/org/python/modules/_io/_io.java
@@ -31,6 +31,7 @@
dict.__setitem__("DEFAULT_BUFFER_SIZE", DEFAULT_BUFFER_SIZE);
dict.__setitem__("_IOBase", PyIOBase.TYPE);
+ dict.__setitem__("_RawIOBase", PyRawIOBase.TYPE);
dict.__setitem__("FileIO", PyFileIO.TYPE);
// Define UnsupportedOperation exception by constructing the type
diff --git a/src/templates/_io._RawIOBase.derived b/src/templates/_io._RawIOBase.derived
new file mode 100644
--- /dev/null
+++ b/src/templates/_io._RawIOBase.derived
@@ -0,0 +1,39 @@
+base_class: PyRawIOBase
+want_dict: false
+ctr:
+no_toString: true
+incl: _io._IOBase
+unary1: readall
+
+rest:
+ // Hand-crafted in _io._RawIOBase.derived
+
+ public PyObject read(int n) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("read");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(Py.newInteger(n));
+ } else {
+ return super.read(n);
+ }
+ }
+
+ public PyObject readinto(PyObject b) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("readinto");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(b);
+ } else {
+ return super.readinto(b);
+ }
+ }
+
+ public PyObject write(PyObject b) {
+ PyType self_type = getType();
+ PyObject impl = self_type.lookup("write");
+ if (impl != null) {
+ return impl.__get__(this, self_type).__call__(b);
+ } else {
+ return super.write(b);
+ }
+ }
diff --git a/src/templates/mappings b/src/templates/mappings
--- a/src/templates/mappings
+++ b/src/templates/mappings
@@ -6,7 +6,6 @@
# will map str.expose to org.python.core.PyString. Many classes will have 2
# lines; one for their expose, and one for their derived class.
-_io._IOBase.derived:org.python.modules._io.PyIOBaseDerived
BaseException.derived:org.python.core.PyBaseExceptionDerived
ClasspathPyImporter.derived:org.python.core.ClasspathPyImporterDerived
PyFileIO.derived:org.python.modules._io.PyFileIODerived
@@ -148,3 +147,5 @@
op_Sub.derived:org.python.antlr.op.SubDerived
op_UAdd.derived:org.python.antlr.op.UAddDerived
op_USub.derived:org.python.antlr.op.USubDerived
+_io._IOBase.derived:org.python.modules._io.PyIOBaseDerived
+_io._RawIOBase.derived:org.python.modules._io.PyRawIOBaseDerived
--
Repository URL: http://hg.python.org/jython
More information about the Jython-checkins
mailing list