[minion-cvs] Make test for file.__iter__ work on pythons without an ...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria:/tmp/cvs-serv23766/src/minion/lib/mixminion

Modified Files:
	Common.py 
Log Message:
Make test for file.__iter__ work on pythons without an "xreadlines" module

Index: Common.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Common.py,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- Common.py	28 Nov 2005 17:06:18 -0000	1.147
+++ Common.py	28 Nov 2005 17:11:20 -0000	1.148
@@ -55,7 +55,15 @@
     file.__iter__
     xreadlines = None
 except (KeyError, AttributeError, NameError), _:
-    import xreadlines
+    try:
+        import xreadlines
+    except ImportError:
+        xreadlines = None
+        
+try:
+    iter
+except NameError:
+    iter = None
 
 from types import StringType
 
@@ -573,8 +581,10 @@
     """
     if xreadlines is not None:
         return xreadlines.xreadlines(f)
-    else:
+    elif iter is not None:
         return iter(f)
+    else:
+        return f.readlines()
 
 def readFile(fn, binary=0):
     """Return the contents of the file named <fn>."""