=== modified file 'Lib/csv.py'
--- Lib/csv.py	2008-03-21 20:01:51 +0000
+++ Lib/csv.py	2008-07-24 15:14:02 +0000
@@ -77,15 +77,18 @@
         self.reader = reader(f, dialect, *args, **kwds)
         self.dialect = dialect
         self.line_num = 0
+        if self.fieldnames is None:
+            try:
+                self.fieldnames = self.reader.next()
+            except StopIteration:
+                pass
+        
 
     def __iter__(self):
         return self
 
     def next(self):
         row = self.reader.next()
-        if self.fieldnames is None:
-            self.fieldnames = row
-            row = self.reader.next()
         self.line_num = self.reader.line_num
 
         # unlike the basic reader, we prefer not to return blanks,