[Jython-checkins] CVS: jython/org/python/modules RegexObject.java,2.6,2.7 _sre.java,1.7,1.8 _weakref.java,1.4,1.5 struct.java,2.9,2.10 time.java,2.22,2.23 xreadlines.java,1.4,1.5

[Frank W. <fwi...@us...>]

Update of /cvsroot/jython/jython/org/python/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv911/org/python/modules

Modified Files:
	RegexObject.java _sre.java _weakref.java struct.java time.java 
	xreadlines.java 
Log Message:
test_types.py from 2.3 mostly supported.  Most files changed because __int__
now returns a PyObject instead of PyInteger (because __int__ can return a
PyLong in some cases)



Index: RegexObject.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/RegexObject.java,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** RegexObject.java	28 Oct 2001 17:13:44 -0000	2.6
--- RegexObject.java	20 Jun 2005 17:12:14 -0000	2.7
***************
*** 237,241 ****
          if (v == null) {
              try {
!                 v = s.__int__();
              }
              catch (PyException exc) {
--- 237,241 ----
          if (v == null) {
              try {
!                 v = (PyInteger)s.__int__();
              }
              catch (PyException exc) {

Index: _sre.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/_sre.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** _sre.java	6 Jan 2002 15:53:24 -0000	1.7
--- _sre.java	20 Jun 2005 17:12:15 -0000	1.8
***************
*** 35,39 ****
              ccode = new char[n];
              for (int i = 0; i < n; i++)
!                 ccode[i] = (char) code.__getitem__(i).__int__().getValue();
          } else {
              throw Py.TypeError("Expected list");
--- 35,39 ----
              ccode = new char[n];
              for (int i = 0; i < n; i++)
!                 ccode[i] = (char) ((PyInteger)code.__getitem__(i).__int__()).getValue();
          } else {
              throw Py.TypeError("Expected list");

Index: _weakref.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/_weakref.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** _weakref.java	6 Aug 2003 11:46:26 -0000	1.4
--- _weakref.java	20 Jun 2005 17:12:15 -0000	1.5
***************
*** 304,308 ****
          public PyString __hex__() { return py().__hex__(); }
          public PyString __oct__() { return py().__oct__(); }
!         public PyInteger __int__() { return py().__int__(); }
          public PyFloat __float__() { return py().__float__(); }
          public PyLong __long__() { return py().__long__(); }
--- 304,308 ----
          public PyString __hex__() { return py().__hex__(); }
          public PyString __oct__() { return py().__oct__(); }
!         public PyObject __int__() { return py().__int__(); }
          public PyFloat __float__() { return py().__float__(); }
          public PyLong __long__() { return py().__long__(); }

Index: struct.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/struct.java,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -d -r2.9 -r2.10
*** struct.java	23 Feb 2005 04:26:22 -0000	2.9
--- struct.java	20 Jun 2005 17:12:15 -0000	2.10
***************
*** 12,15 ****
--- 12,16 ----
  import org.python.core.PyException;
  import org.python.core.PyFloat;
+ import org.python.core.PyInteger;
  import org.python.core.PyList;
  import org.python.core.PyLong;
***************
*** 322,326 ****
          int get_int(PyObject value) {
              try {
!                 return value.__int__().getValue();
              } catch (PyException ex) {
                  throw StructError("required argument is not an integer");
--- 323,327 ----
          int get_int(PyObject value) {
              try {
!                 return ((PyInteger)value.__int__()).getValue();
              } catch (PyException ex) {
                  throw StructError("required argument is not an integer");

Index: time.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -d -r2.22 -r2.23
*** time.java	2 Mar 2005 07:16:17 -0000	2.22
--- time.java	20 Jun 2005 17:12:15 -0000	2.23
***************
*** 139,143 ****
          // knows about and asserts format on tuple items.  See
          // documentation for Python's time module for details.
!         int val = tup.__getitem__(i).__int__().getValue();
          boolean valid = true;
          switch (i) {
--- 139,143 ----
          // knows about and asserts format on tuple items.  See
          // documentation for Python's time module for details.
!         int val = ((PyInteger)tup.__getitem__(i).__int__()).getValue();
          boolean valid = true;
          switch (i) {

Index: xreadlines.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/xreadlines.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xreadlines.java	22 Feb 2005 04:19:33 -0000	1.4
--- xreadlines.java	20 Jun 2005 17:12:15 -0000	1.5
***************
*** 34,38 ****
  
          public PyObject __finditem__(PyObject idx) {
!             return __finditem__(idx.__int__().getValue());
          }
  
--- 34,38 ----
  
          public PyObject __finditem__(PyObject idx) {
!             return __finditem__(((PyInteger)idx.__int__()).getValue());
          }