--- a/branches/1.5/turbogears/config.py
+++ b/branches/1.5/turbogears/config.py
@@ -60,10 +60,10 @@
                         " is not a recognizable logger name" % key)
             try:
                 handler_obj = cls(*eval(args, logging.__dict__))
-            except IOError,err:
+            except IOError, err:
                 raise ConfigError("Missing or wrong argument to %s"
                     " in handler %s -> %s " % (cls.__name__,key,err))
-            except TypeError,err:
+            except TypeError, err:
                 raise ConfigError("Wrong format for arguments to %s"
                     " in handler %s -> %s" % (cls.__name__,key,err))
             if level:
@@ -203,8 +203,8 @@
         defaults.update(dict(top_level_dir=top_level_dir,
             package_dir=package_dir))
         configdata.merge(dict(DEFAULT=defaults))
-        for file in configfiles:
-            configdata2 = ConfigObj(file, unrepr=True)
+        for configfile2 in configfiles:
+            configdata2 = ConfigObj(configfile2, unrepr=True)
             configdata2.merge(dict(DEFAULT=defaults))
             configdata.merge(configdata2)