=== modified file 'Lib/csv.py'
--- Lib/csv.py	2008-04-24 18:26:53 +0000
+++ Lib/csv.py	2008-07-24 09:02:41 +0000
@@ -74,15 +74,17 @@
         self.reader = reader(f, dialect, *args, **kwds)
         self.dialect = dialect
         self.line_num = 0
+        if self.fieldnames is None:
+            try:
+                self.fieldnames = next(self.reader)
+            except StopIteration:
+                pass
 
     def __iter__(self):
         return self
 
     def __next__(self):
         row = next(self.reader)
-        if self.fieldnames is None:
-            self.fieldnames = row
-            row = next(self.reader)
         self.line_num = self.reader.line_num
 
         # unlike the basic reader, we prefer not to return blanks,