diff MoinMoin/user.py @ 1920:b06ef2a53efa

'make pylint', fixed lots of minor stuff found by pylint (and there is still lots left to do)
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 30 Mar 2007 21:50:50 +0200
parents bb2e053067fb
children eefebea247a0
line wrap: on
line diff
--- a/MoinMoin/user.py	Tue Mar 27 21:50:05 2007 +0200
+++ b/MoinMoin/user.py	Fri Mar 30 21:50:50 2007 +0200
@@ -65,8 +65,8 @@
         except caching.CacheError:
             _name2id = {}
         cfg.cache.name2id = _name2id
-    id = _name2id.get(searchName, None)
-    if id is None:
+    uid = _name2id.get(searchName, None)
+    if uid is None:
         for userid in getUserList(request):
             name = User(request, id=userid).name
             _name2id[name] = userid
@@ -78,8 +78,8 @@
             cache.update(_name2id)
         except caching.CacheError:
             pass
-        id = _name2id.get(searchName, None)
-    return id
+        uid = _name2id.get(searchName, None)
+    return uid
 
 
 def getUserIdentification(request, username=None):
@@ -855,11 +855,11 @@
         data = '\n'.join(self._trail) + '\n'
         path = self.__filename() + ".trail"
         try:
-            file = codecs.open(path, "w", config.charset)
+            f = codecs.open(path, "w", config.charset)
             try:
-                file.write(data)
+                f.write(data)
             finally:
-                file.close()
+                f.close()
         except (IOError, OSError), err:
             self._request.log("Can't save trail file: %s" % str(err))