Rev 5319: Don't use python builtins as variable names. in file:///home/vila/src/bzr/bugs/525571-lock-bazaar-conf-files/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/525571-lock-bazaar-conf-files/

------------------------------------------------------------
revno: 5319
revision-id: v.ladeuil+lp at free.fr-20100625120429-2m24zqgu9d7x8ocw
parent: pqm at pqm.ubuntu.com-20100624111149-o3crzmivr896yafb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 525571-lock-bazaar-conf-files
timestamp: Fri 2010-06-25 14:04:29 +0200
message:
  Don't use python builtins as variable names.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2010-06-02 04:50:35 +0000
+++ b/bzrlib/config.py	2010-06-25 12:04:29 +0000
@@ -356,15 +356,15 @@
         self._get_filename = get_filename
         self._parser = None
 
-    def _get_parser(self, file=None):
+    def _get_parser(self, f=None):
         if self._parser is not None:
             return self._parser
-        if file is None:
-            input = self._get_filename()
+        if f is None:
+            co_input = self._get_filename()
         else:
-            input = file
+            co_input = f
         try:
-            self._parser = ConfigObj(input, encoding='utf-8')
+            self._parser = ConfigObj(co_input, encoding='utf-8')
         except configobj.ConfigObjError, e:
             raise errors.ParseConfigError(e.errors, e.config.filename)
         return self._parser