Menu
▾
▴
[Jython-checkins] CVS: jython/org/python/modules MD5Module.java,2.9,2.10 _weakref.java,1.2,1.3 cPickle.java,1.20,1.21 codeop.java,2.8,2.9 operator.java,2.7,2.8 thread.java,2.5,2.6 time.java,2.19,2.20 types.java,2.6,2.7
Update of /cvsroot/jython/jython/org/python/modules
In directory usw-pr-cvs1:/tmp/cvs-serv31804/modules
Modified Files:
MD5Module.java _weakref.java cPickle.java codeop.java
operator.java thread.java time.java types.java
Log Message:
Long line normalization.
Index: MD5Module.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/MD5Module.java,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -d -r2.9 -r2.10
*** MD5Module.java 2001/10/28 17:13:44 2.9
--- MD5Module.java 2001/11/27 19:07:22 2.10
***************
*** 44,56 ****
"This module implements the interface to RSA's MD5 message digest\n"+
"algorithm (see also Internet RFC 1321). Its use is quite\n"+
! "straightforward: use the new() to create an md5 object. You can now\n"+
! "feed this object with arbitrary strings using the update() method, and\n"+
! "at any point you can ask it for the digest (a strong kind of 128-bit\n"+
! "checksum, a.k.a. ``fingerprint'') of the concatenation of the strings\n"+
"fed to it so far using the digest() method.\n"+
"\n"+
"Functions:\n"+
"\n"+
! "new([arg]) -- return a new md5 object, initialized with arg if provided\n"+
"md5([arg]) -- DEPRECATED, same as new, but for compatibility\n"+
"\n"+
--- 44,61 ----
"This module implements the interface to RSA's MD5 message digest\n"+
"algorithm (see also Internet RFC 1321). Its use is quite\n"+
! "straightforward: use the new() to create an md5 object. "+
! "You can now\n"+
! "feed this object with arbitrary strings using the update() method, "+
! "and\n"+
! "at any point you can ask it for the digest (a strong kind of "+
! "128-bit\n"+
! "checksum, a.k.a. ``fingerprint'') of the concatenation of the "+
! "strings\n"+
"fed to it so far using the digest() method.\n"+
"\n"+
"Functions:\n"+
"\n"+
! "new([arg]) -- return a new md5 object, initialized with arg if "+
! "provided\n"+
"md5([arg]) -- DEPRECATED, same as new, but for compatibility\n"+
"\n"+
Index: _weakref.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/_weakref.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** _weakref.java 2001/11/27 13:51:37 1.2
--- _weakref.java 2001/11/27 19:07:22 1.3
***************
*** 240,244 ****
if (o == null) {
throw new PyException(ReferenceError,
! "weakly-referenced object no longer exists");
}
return o;
--- 240,244 ----
if (o == null) {
throw new PyException(ReferenceError,
! "weakly-referenced object no longer exists");
}
return o;
***************
*** 253,257 ****
return null;
PyObject pythis = (PyObject) gref.get();
! PyObject pyother = (PyObject) ((AbstractReference) other).gref.get();
if (pythis == null || pyother == null)
return this == other ? Py.One : Py.Zero;
--- 253,258 ----
return null;
PyObject pythis = (PyObject) gref.get();
! PyObject pyother = (PyObject) ((AbstractReference) other).
! gref.get();
if (pythis == null || pyother == null)
return this == other ? Py.One : Py.Zero;
Index: cPickle.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/cPickle.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** cPickle.java 2001/11/27 13:51:37 1.20
--- cPickle.java 2001/11/27 19:07:22 1.21
***************
*** 499,508 ****
public static PyObject _UnpickleableError(PyObject[] arg, String[] kws) {
PyObject dict = _empty__init__(arg, kws);
! dict.__setitem__("__init__", getJavaFunc("_UnpickleableError__init__"));
! dict.__setitem__("__str__", getJavaFunc("_UnpickleableError__str__"));
return dict;
}
! public static void _UnpickleableError__init__(PyObject[] arg, String[] kws) {
ArgParser ap = new ArgParser("__init__", arg, kws, "self", "args");
PyObject self = ap.getPyObject(0);
--- 499,512 ----
public static PyObject _UnpickleableError(PyObject[] arg, String[] kws) {
PyObject dict = _empty__init__(arg, kws);
! dict.__setitem__("__init__",
! getJavaFunc("_UnpickleableError__init__"));
! dict.__setitem__("__str__",
! getJavaFunc("_UnpickleableError__str__"));
return dict;
}
! public static void _UnpickleableError__init__(PyObject[] arg,
! String[] kws)
! {
ArgParser ap = new ArgParser("__init__", arg, kws, "self", "args");
PyObject self = ap.getPyObject(0);
***************
*** 512,516 ****
}
! public static PyString _UnpickleableError__str__(PyObject[] arg, String[] kws) {
ArgParser ap = new ArgParser("__str__", arg, kws, "self");
PyObject self = ap.getPyObject(0);
--- 516,522 ----
}
! public static PyString _UnpickleableError__str__(PyObject[] arg,
! String[] kws)
! {
ArgParser ap = new ArgParser("__str__", arg, kws, "self");
PyObject self = ap.getPyObject(0);
Index: codeop.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/codeop.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** codeop.java 2001/11/27 13:51:37 2.8
--- codeop.java 2001/11/27 19:07:22 2.9
***************
*** 33,37 ****
}
! public static PyObject compile_command_flags(String string,String filename,String kind,CompilerFlags cflags)
{
org.python.parser.SimpleNode node =
--- 33,38 ----
}
! public static PyObject compile_command_flags(String string,
! String filename, String kind, CompilerFlags cflags)
{
org.python.parser.SimpleNode node =
***************
*** 40,44 ****
if (node == null)
return Py.None;
! return Py.compile_flags(node, Py.getName(), filename, true, true,cflags);
}
--- 41,46 ----
if (node == null)
return Py.None;
! return Py.compile_flags(node, Py.getName(), filename, true, true,
! cflags);
}
Index: operator.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/operator.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -d -r2.7 -r2.8
*** operator.java 2001/10/28 17:13:44 2.7
--- operator.java 2001/11/27 19:07:22 2.8
***************
*** 84,91 ****
"Operator interface.\n"+
"\n"+
! "This module exports a set of functions implemented in C corresponding\n"+
! "to the intrinsic operators of Python. For example, operator.add(x, y)\n"+
! "is equivalent to the expression x+y. The function names are those\n"+
! "used for special class methods; variants without leading and trailing\n"+
"'__' are also provided for convenience.\n"
);
--- 84,95 ----
"Operator interface.\n"+
"\n"+
! "This module exports a set of functions implemented in C "+
! "corresponding\n"+
! "to the intrinsic operators of Python. For example, "+
! "operator.add(x, y)\n"+
! "is equivalent to the expression x+y. The function names "+
! "are those\n"+
! "used for special class methods; variants without leading "+
! "and trailing\n"+
"'__' are also provided for convenience.\n"
);
Index: thread.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/thread.java,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -d -r2.5 -r2.6
*** thread.java 2001/10/28 17:13:44 2.5
--- thread.java 2001/11/27 19:07:22 2.6
***************
*** 29,33 ****
{
public static PyString __doc__ = new PyString(
! "This module provides primitive operations to write multi-threaded programs.\n" +
"The 'threading' module provides a more convenient interface."
);
--- 29,34 ----
{
public static PyString __doc__ = new PyString(
! "This module provides primitive operations to write multi-threaded "+
! "programs.\n" +
"The 'threading' module provides a more convenient interface."
);
Index: time.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -d -r2.19 -r2.20
*** time.java 2001/11/27 13:51:37 2.19
--- time.java 2001/11/27 19:07:22 2.20
***************
*** 55,65 ****
"This module provides various functions to manipulate time values.\n"+
"\n"+
! "There are two standard representations of time. One is the number\n"+
! "of seconds since the Epoch, in UTC (a.k.a. GMT). It may be an integer\n"+
"or a floating point number (to represent fractions of seconds).\n"+
! "The Epoch is system-defined; on Unix, it is generally January 1st, 1970.\n"+
"The actual value can be retrieved by calling gmtime(0).\n"+
"\n"+
! "The other representation is a tuple of 9 integers giving local time.\n"+
"The tuple items are:\n"+
" year (four digits, e.g. 1998)\n"+
--- 55,69 ----
"This module provides various functions to manipulate time values.\n"+
"\n"+
! "There are two standard representations of time. One is the "+
! "number\n"+
! "of seconds since the Epoch, in UTC (a.k.a. GMT). It may be an "+
! "integer\n"+
"or a floating point number (to represent fractions of seconds).\n"+
! "The Epoch is system-defined; on Unix, it is generally "+
! "January 1st, 1970.\n"+
"The actual value can be retrieved by calling gmtime(0).\n"+
"\n"+
! "The other representation is a tuple of 9 integers giving "+
! "local time.\n"+
"The tuple items are:\n"+
" year (four digits, e.g. 1998)\n"+
***************
*** 78,82 ****
"Variables:\n"+
"\n"+
! "timezone -- difference in seconds between UTC and local standard time\n"+
"altzone -- difference in seconds between UTC and local DST time\n"+
"daylight -- whether local time should reflect DST\n"+
--- 82,87 ----
"Variables:\n"+
"\n"+
! "timezone -- difference in seconds between UTC and local "+
! "standard time\n"+
"altzone -- difference in seconds between UTC and local DST time\n"+
"daylight -- whether local time should reflect DST\n"+
***************
*** 85,89 ****
"Functions:\n"+
"\n"+
! "time() -- return current time in seconds since the Epoch as a float\n"+
"clock() -- return CPU time since process start as a float\n"+
"sleep() -- delay for a number of seconds given as a float\n"+
--- 90,95 ----
"Functions:\n"+
"\n"+
! "time() -- return current time in seconds since the Epoch "+
! "as a float\n"+
"clock() -- return CPU time since process start as a float\n"+
"sleep() -- delay for a number of seconds given as a float\n"+
***************
*** 93,98 ****
"ctime() -- convert time in seconds to string\n"+
"mktime() -- convert local time tuple to seconds since Epoch\n"+
! "strftime() -- convert time tuple to string according to format specification\n"+
! "strptime() -- parse string to time tuple according to format specification\n"
);
--- 99,106 ----
"ctime() -- convert time in seconds to string\n"+
"mktime() -- convert local time tuple to seconds since Epoch\n"+
! "strftime() -- convert time tuple to string according to "+
! "format specification\n"+
! "strptime() -- parse string to time tuple according to "+
! "format specification\n"
);
***************
*** 578,582 ****
}
! private static String getDisplayName(TimeZone tz, boolean dst, int style) {
String version = System.getProperty("java.version");
if (version.compareTo("1.2") >= 0) {
--- 586,592 ----
}
! private static String getDisplayName(TimeZone tz, boolean dst,
! int style)
! {
String version = System.getProperty("java.version");
if (version.compareTo("1.2") >= 0) {
Index: types.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/types.java,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** types.java 2001/10/28 17:13:44 2.6
--- types.java 2001/11/27 19:07:22 2.7
***************
*** 5,11 ****
public class types implements ClassDictInit {
public static PyString __doc__ = new PyString(
! "Define names for all type symbols known in the standard interpreter.\n"+
"\n"+
! "Types that are part of optional modules (e.g. array) are not listed.\n"
);
--- 5,13 ----
public class types implements ClassDictInit {
public static PyString __doc__ = new PyString(
! "Define names for all type symbols known in the standard "+
! "interpreter.\n"+
"\n"+
! "Types that are part of optional modules (e.g. array) "+
! "are not listed.\n"
);
|