[Jython-checkins] SF.net SVN: jython:[5487] trunk/jython/src/org/python/core/PyFile.java

[<pj...@us...>]

Revision: 5487
          http://jython.svn.sourceforge.net/jython/?rev=5487&view=rev
Author:   pjenvey
Date:     2008-10-20 23:53:47 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
__iter__ is just another file_self call

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyFile.java

Modified: trunk/jython/src/org/python/core/PyFile.java
===================================================================
--- trunk/jython/src/org/python/core/PyFile.java	2008-10-20 21:37:06 UTC (rev 5486)
+++ trunk/jython/src/org/python/core/PyFile.java	2008-10-20 23:53:47 UTC (rev 5487)
@@ -349,16 +349,6 @@
         return file_readlines(0);
     }
 
-    public PyObject __iter__() {
-        return file___iter__();
-    }
-
-    @ExposedMethod
-    final PyObject file___iter__() {
-        checkClosed();
-        return this;
-    }
-
     public PyObject __iternext__() {
         return file___iternext__();
     }
@@ -385,7 +375,7 @@
         return file_next();
     }
 
-    @ExposedMethod(names = {"__enter__", "xreadlines"})
+    @ExposedMethod(names = {"__enter__", "__iter__", "xreadlines"})
     final PyObject file_self() {
         checkClosed();
         return this;
@@ -395,6 +385,10 @@
         return file_self();
     }
 
+    public PyObject __iter__() {
+        return file_self();
+    }
+
     public PyObject xreadlines() {
         return file_self();
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.