Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5834] trunk/jython/src/org/python/core
|
From: <fwi...@us...> - 2009-01-03 02:47:58
|
Revision: 5834
http://jython.svn.sourceforge.net/jython/?rev=5834&view=rev
Author: fwierzbicki
Date: 2009-01-03 02:47:53 +0000 (Sat, 03 Jan 2009)
Log Message:
-----------
__doc__ for complex, xrange, file.
Modified Paths:
--------------
trunk/jython/src/org/python/core/PyComplex.java
trunk/jython/src/org/python/core/PyFile.java
trunk/jython/src/org/python/core/PyXRange.java
Modified: trunk/jython/src/org/python/core/PyComplex.java
===================================================================
--- trunk/jython/src/org/python/core/PyComplex.java 2009-01-02 15:36:57 UTC (rev 5833)
+++ trunk/jython/src/org/python/core/PyComplex.java 2009-01-03 02:47:53 UTC (rev 5834)
@@ -130,7 +130,7 @@
return complex_toString();
}
- @ExposedMethod(names = {"__repr__", "__str__"})
+ @ExposedMethod(names = {"__repr__", "__str__"}, doc = BuiltinDocs.complex___str___doc)
final String complex_toString() {
if (real == 0.) {
return toString(imag)+"j";
@@ -147,7 +147,7 @@
return complex___hash__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex___hash___doc)
final int complex___hash__() {
if (imag == 0) {
return new PyFloat(real).hashCode();
@@ -162,7 +162,7 @@
return complex___nonzero__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex___nonzero___doc)
final boolean complex___nonzero__() {
return real != 0 && imag != 0;
}
@@ -193,7 +193,7 @@
return complex___eq__(other);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___eq___doc)
final PyObject complex___eq__(PyObject other) {
if (!canCoerce(other))
return null;
@@ -208,7 +208,7 @@
return complex___ne__(other);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___ne___doc)
final PyObject complex___ne__(PyObject other) {
if (!canCoerce(other))
return null;
@@ -226,7 +226,7 @@
return complex___ge__(other);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___ge___doc)
final PyObject complex___ge__(PyObject other) {
return unsupported_comparison(other);
}
@@ -235,7 +235,7 @@
return complex___gt__(other);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___gt___doc)
final PyObject complex___gt__(PyObject other) {
return unsupported_comparison(other);
}
@@ -244,7 +244,7 @@
return complex___le__(other);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___le___doc)
final PyObject complex___le__(PyObject other) {
return unsupported_comparison(other);
}
@@ -253,7 +253,7 @@
return complex___lt__(other);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___lt___doc)
final PyObject complex___lt__(PyObject other) {
return unsupported_comparison(other);
}
@@ -262,7 +262,7 @@
return complex___coerce_ex__(other);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex___coerce___doc)
final PyObject complex___coerce__(PyObject other) {
return adaptToCoerceTuple(complex___coerce_ex__(other));
}
@@ -306,7 +306,7 @@
return complex___add__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___add___doc)
final PyObject complex___add__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -318,7 +318,7 @@
return complex___radd__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___radd___doc)
final PyObject complex___radd__(PyObject left) {
return __add__(left);
}
@@ -331,7 +331,7 @@
return complex___sub__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___sub___doc)
final PyObject complex___sub__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -342,7 +342,7 @@
return complex___rsub__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___rsub___doc)
final PyObject complex___rsub__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -358,7 +358,7 @@
return complex___mul__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___mul___doc)
final PyObject complex___mul__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -369,7 +369,7 @@
return complex___rmul__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___rmul___doc)
final PyObject complex___rmul__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -401,7 +401,7 @@
return complex___div__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___div___doc)
final PyObject complex___div__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -414,7 +414,7 @@
return complex___rdiv__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___rdiv___doc)
final PyObject complex___rdiv__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -427,7 +427,7 @@
return complex___floordiv__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___floordiv___doc)
final PyObject complex___floordiv__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -438,7 +438,7 @@
return complex___rfloordiv__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___rfloordiv___doc)
final PyObject complex___rfloordiv__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -449,7 +449,7 @@
return complex___truediv__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___truediv___doc)
final PyObject complex___truediv__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -460,7 +460,7 @@
return complex___rtruediv__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___rtruediv___doc)
final PyObject complex___rtruediv__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -471,7 +471,7 @@
return complex___mod__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___mod___doc)
final PyObject complex___mod__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -482,7 +482,7 @@
return complex___rmod__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___rmod___doc)
final PyObject complex___rmod__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -503,7 +503,7 @@
return complex___divmod__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___divmod___doc)
final PyObject complex___divmod__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -514,7 +514,7 @@
return complex___rdivmod__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___rdivmod___doc)
final PyObject complex___rdivmod__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -569,7 +569,7 @@
return complex___pow__(right, modulo);
}
- @ExposedMethod(type = MethodType.BINARY, defaults = "null")
+ @ExposedMethod(type = MethodType.BINARY, defaults = "null", doc = BuiltinDocs.complex___pow___doc)
final PyObject complex___pow__(PyObject right, PyObject modulo) {
if (modulo != null) {
throw Py.ValueError("complex modulo");
@@ -583,7 +583,7 @@
return complex___rpow__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.complex___rpow___doc)
final PyObject complex___rpow__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -628,7 +628,7 @@
return complex___neg__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex___neg___doc)
final PyObject complex___neg__() {
return new PyComplex(-real, -imag);
}
@@ -637,7 +637,7 @@
return complex___pos__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex___pos___doc)
final PyObject complex___pos__() {
return new PyComplex(real, imag);
}
@@ -650,7 +650,7 @@
return complex___abs__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex___abs___doc)
final PyObject complex___abs__() {
return new PyFloat(Math.hypot(real, imag));
}
@@ -659,7 +659,7 @@
return complex___int__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex___int___doc)
final PyInteger complex___int__() {
throw Py.TypeError(
"can't convert complex to int; use e.g. int(abs(z))");
@@ -669,7 +669,7 @@
return complex___long__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex___long___doc)
final PyObject complex___long__() {
throw Py.TypeError(
"can't convert complex to long; use e.g. long(abs(z))");
@@ -679,7 +679,7 @@
return complex___float__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex___float___doc)
final PyFloat complex___float__() {
throw Py.TypeError("can't convert complex to float; use e.g. abs(z)");
}
@@ -692,12 +692,12 @@
return complex_conjugate();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex_conjugate_doc)
final PyComplex complex_conjugate() {
return new PyComplex(real, -imag);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.complex___getnewargs___doc)
final PyTuple complex___getnewargs__() {
return new PyTuple(new PyComplex(real, imag));
}
Modified: trunk/jython/src/org/python/core/PyFile.java
===================================================================
--- trunk/jython/src/org/python/core/PyFile.java 2009-01-02 15:36:57 UTC (rev 5833)
+++ trunk/jython/src/org/python/core/PyFile.java 2009-01-03 02:47:53 UTC (rev 5834)
@@ -140,7 +140,7 @@
}
@ExposedNew
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file___init___doc)
final void file___init__(PyObject[] args, String[] kwds) {
ArgParser ap = new ArgParser("file", args, kwds, new String[] {"name", "mode", "bufsize"},
1);
@@ -239,7 +239,7 @@
+ (updating ? "+" : "");
}
- @ExposedMethod(defaults = {"-1"})
+ @ExposedMethod(defaults = {"-1"}, doc = BuiltinDocs.file_read_doc)
final synchronized PyString file_read(int n) {
checkClosed();
return new PyString(file.read(n));
@@ -253,7 +253,7 @@
return file_read(-1);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file_readinto_doc)
final synchronized int file_readinto(PyObject buf) {
checkClosed();
return file.readinto(buf);
@@ -263,7 +263,7 @@
return file_readinto(buf);
}
- @ExposedMethod(defaults = {"-1"})
+ @ExposedMethod(defaults = {"-1"}, doc = BuiltinDocs.file_readline_doc)
final synchronized PyString file_readline(int max) {
checkClosed();
return new PyString(file.readline(max));
@@ -277,7 +277,7 @@
return file_readline(-1);
}
- @ExposedMethod(defaults = {"0"})
+ @ExposedMethod(defaults = {"0"}, doc = BuiltinDocs.file_readlines_doc)
final synchronized PyObject file_readlines(int sizehint) {
checkClosed();
PyList list = new PyList();
@@ -316,7 +316,7 @@
return new PyString(next);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file_next_doc)
final PyObject file_next() {
PyObject ret = file___iternext__();
if (ret == null) {
@@ -329,7 +329,7 @@
return file_next();
}
- @ExposedMethod(names = {"__enter__", "__iter__", "xreadlines"})
+ @ExposedMethod(names = {"__enter__", "__iter__", "xreadlines"}, doc = BuiltinDocs.file___iter___doc)
final PyObject file_self() {
checkClosed();
return this;
@@ -347,7 +347,7 @@
return file_self();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file_write_doc)
final void file_write(PyObject o) {
if (o instanceof PyUnicode) {
// Call __str__ on unicode objects to encode them before writing
@@ -369,7 +369,7 @@
file_write(s);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file_writelines_doc)
final synchronized void file_writelines(PyObject a) {
checkClosed();
PyObject iter = Py.iter(a, "writelines() requires an iterable argument");
@@ -387,7 +387,7 @@
file_writelines(a);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file_tell_doc)
final synchronized long file_tell() {
checkClosed();
return file.tell();
@@ -397,7 +397,7 @@
return file_tell();
}
- @ExposedMethod(defaults = {"0"})
+ @ExposedMethod(defaults = {"0"}, doc = BuiltinDocs.file_seek_doc)
final synchronized void file_seek(long pos, int how) {
checkClosed();
file.seek(pos, how);
@@ -411,7 +411,7 @@
file_seek(pos, 0);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file_flush_doc)
final synchronized void file_flush() {
checkClosed();
file.flush();
@@ -421,7 +421,7 @@
file_flush();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file_close_doc)
final synchronized void file_close() {
if (closer != null) {
closer.close();
@@ -435,7 +435,7 @@
file_close();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file___exit___doc)
final void file___exit__(PyObject type, PyObject value, PyObject traceback) {
file_close();
}
@@ -444,7 +444,7 @@
file___exit__(type, value, traceback);
}
- @ExposedMethod(defaults = {"null"})
+ @ExposedMethod(defaults = {"null"}, doc = BuiltinDocs.file_truncate_doc)
final void file_truncate(PyObject position) {
if (position == null) {
file_truncate();
@@ -477,7 +477,7 @@
return file_isatty();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file_isatty_doc)
final boolean file_isatty() {
return file.isatty();
}
@@ -486,12 +486,12 @@
return file_fileno();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.file_fileno_doc)
final PyObject file_fileno() {
return PyJavaType.wrapJavaObject(file.fileno());
}
- @ExposedMethod(names = {"__str__", "__repr__"})
+ @ExposedMethod(names = {"__str__", "__repr__"}, doc = BuiltinDocs.file___str___doc)
final String file_toString() {
StringBuilder s = new StringBuilder("<");
if (file.closed()) {
Modified: trunk/jython/src/org/python/core/PyXRange.java
===================================================================
--- trunk/jython/src/org/python/core/PyXRange.java 2009-01-02 15:36:57 UTC (rev 5833)
+++ trunk/jython/src/org/python/core/PyXRange.java 2009-01-03 02:47:53 UTC (rev 5834)
@@ -93,7 +93,7 @@
return xrange___len__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.xrange___len___doc)
final int xrange___len__() {
return len;
}
@@ -103,7 +103,7 @@
return xrange___getitem__(index);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.xrange___getitem___doc)
final PyObject xrange___getitem__(PyObject index) {
PyObject ret = seq___finditem__(index);
if (ret == null) {
@@ -112,7 +112,7 @@
return ret;
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.xrange___iter___doc)
public PyObject xrange___iter__() {
return seq___iter__();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
