meld r1246 - trunk/vc

[vincele svn gnome org]

Author: vincele
Date: Mon Mar  9 22:52:40 2009
New Revision: 1246
URL: http://svn.gnome.org/viewvc/meld?rev=1246&view=rev

Log:
Pylint warns about redefining the "dir" builtin, use "folder" as variable name


Modified:
   trunk/vc/git.py

Modified: trunk/vc/git.py
==============================================================================
--- trunk/vc/git.py	(original)
+++ trunk/vc/git.py	Mon Mar  9 22:52:40 2009
@@ -133,7 +133,7 @@
         for path, state in tree.iteritems():
             # removed files are not in the filesystem, so must be added here
             if state is _vc.STATE_REMOVED:
-                dir, name = os.path.split(path)
-                if dir == directory:
+                folder, name = os.path.split(path)
+                if folder == directory:
                     retfiles.append( _vc.File(path, name, state) )
         return retdirs, retfiles