Update of /cvsroot/jython/jython/org/python/modules/sre
In directory usw-pr-cvs1:/tmp/cvs-serv15999/modules/sre
Modified Files:
PatternObject.java
Log Message:
Support for the __iter__ protocol. With this change, all loops over
sequences will use the __iter__() method to get a iterator object and all
builtin sequence objects will ofcourse define the __iter__() method.
Index: PatternObject.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/sre/PatternObject.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PatternObject.java 2002/01/06 15:53:25 1.8
--- PatternObject.java 2002/01/06 21:19:14 1.9
***************
*** 293,297 ****
- /* Enable "finditer" when iter support is added.
public PyObject finditer(String string) {
return finditer(string, 0, Integer.MAX_VALUE);
--- 293,296 ----
***************
*** 305,311 ****
ScannerObject scanner = scanner(string, start, end);
PyObject search = scanner.__findattr__("search");
! return new PyCallIterator(search, Py.None);
}
- */
public ScannerObject scanner(String string) {
--- 304,309 ----
ScannerObject scanner = scanner(string, start, end);
PyObject search = scanner.__findattr__("search");
! return new PyCallIter(search, Py.None);
}
public ScannerObject scanner(String string) {
|
