[Mpuls-commits] r2238 - in wasko/branches/2.0: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-03-29 17:38:06 +0200 (Mon, 29 Mar 2010)
New Revision: 2238

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/lib/security.py
Log:
* mpulsweb/lib/security.py: Fix formatting.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-29 15:35:19 UTC (rev 2237)
+++ wasko/branches/2.0/ChangeLog	2010-03-29 15:38:06 UTC (rev 2238)
@@ -1,5 +1,9 @@
 2010-03-29  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/security.py: Fix formatting.
+
+2010-03-29  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/timelog.py: Fix formatting.
 
 2010-03-29  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/mpulsweb/lib/security.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/security.py	2010-03-29 15:35:19 UTC (rev 2237)
+++ wasko/branches/2.0/mpulsweb/lib/security.py	2010-03-29 15:38:06 UTC (rev 2238)
@@ -107,10 +107,10 @@
 
     log.info('Login: user "%s" in "%s"' % (user, dbname))
     try:
-        mydb = DB(dbname=config.get('mpuls.db.database') % dbname, 
-                  host=config.get('mpuls.db.host'), 
+        mydb = DB(dbname=config.get('mpuls.db.database') % dbname,
+                  host=config.get('mpuls.db.host'),
                   port=config.get('mpuls.db.port'),
-                  user=config.get('mpuls.db.user') % (dbname, user), 
+                  user=config.get('mpuls.db.user') % (dbname, user),
                   password=password)
         try:
             enter(mydb)
@@ -219,7 +219,8 @@
                     NEW_DBS[parts[0]] = parts[1]
         finally:
             if f:
-                try: f.close()
+                try:
+                    f.close()
                 except StandardError:
                     log.exception("Exception while closing db mapping file %r",
                                   fname)