diff -r f1094697d7dc Lib/csv.py
--- a/Lib/csv.py	Fri Sep 28 17:17:11 2012 +0200
+++ b/Lib/csv.py	Fri Sep 28 20:01:32 2012 +0300
@@ -77,12 +77,12 @@
 
 
 class DictReader:
-    def __init__(self, f, fieldnames=None, restkey=None, restval=None,
+    def __init__(self, csvfile, fieldnames=None, restkey=None, restval=None,
                  dialect="excel", *args, **kwds):
         self._fieldnames = fieldnames   # list of keys for the dict
         self.restkey = restkey          # key to catch long rows
         self.restval = restval          # default value for short rows
-        self.reader = reader(f, dialect, *args, **kwds)
+        self.reader = reader(csvfile, dialect, *args, **kwds)
         self.dialect = dialect
         self.line_num = 0
 
@@ -127,7 +127,7 @@
 
 
 class DictWriter:
-    def __init__(self, f, fieldnames, restval="", extrasaction="raise",
+    def __init__(self, csvfile, fieldnames, restval="", extrasaction="raise",
                  dialect="excel", *args, **kwds):
         self.fieldnames = fieldnames    # list of keys for the dict
         self.restval = restval          # for writing short dicts
@@ -135,7 +135,7 @@
             raise ValueError("extrasaction (%s) must be 'raise' or 'ignore'"
                              % extrasaction)
         self.extrasaction = extrasaction
-        self.writer = writer(f, dialect, *args, **kwds)
+        self.writer = writer(csvfile, dialect, *args, **kwds)
 
     def writeheader(self):
         header = dict(zip(self.fieldnames, self.fieldnames))