[Mpuls-commits] r105 - in waska/trunk: . waskaweb/lib waskaweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2008-09-01 10:26:10 +0200 (Mon, 01 Sep 2008)
New Revision: 105

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/lib/security.py
   waska/trunk/waskaweb/model/user.py
Log:
Fixed syntax error


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-08-30 13:34:06 UTC (rev 104)
+++ waska/trunk/ChangeLog.txt	2008-09-01 08:26:10 UTC (rev 105)
@@ -1,3 +1,10 @@
+2008-09-01	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Fixed syntax error
+
+	* waskaweb/model/user.py,
+	  waskaweb/lib/security.py: Fixed sytanx error.
+
 2008-08-30	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Implemented listing news based on last logintime

Modified: waska/trunk/waskaweb/lib/security.py
===================================================================
--- waska/trunk/waskaweb/lib/security.py	2008-08-30 13:34:06 UTC (rev 104)
+++ waska/trunk/waskaweb/lib/security.py	2008-09-01 08:26:10 UTC (rev 105)
@@ -124,6 +124,7 @@
                     userobject = SessionSuperAdmin(login, password)
                 else:
                     return None
+
                 # UPDATE last login time
                 try:
                     cursor = conn.cursor()
@@ -136,12 +137,13 @@
                             print "Error on setting last logintime: %s" % cursor.query 
                 finally:
                     db.recycleConnection(conn, cursor)
-                except StandardError, err:
-                    traceback.print_exc(file=sys.stderr)
-                    print "Error on creating user Object: %s" % err
 
-                #RETURN userobject
-                return userobject
+            except StandardError, err:
+                traceback.print_exc(file=sys.stderr)
+                print "Error on creating user Object: %s" % err
+
+            #RETURN userobject
+            return userobject
         finally:
             leave(mydb)
             mydb.closeConnections()

Modified: waska/trunk/waskaweb/model/user.py
===================================================================
--- waska/trunk/waskaweb/model/user.py	2008-08-30 13:34:06 UTC (rev 104)
+++ waska/trunk/waskaweb/model/user.py	2008-09-01 08:26:10 UTC (rev 105)
@@ -331,7 +331,7 @@
         self.activated = data.get('activated', False) 
         self.needs_passrefresh = data.get('newpass', True) 
         self.role = data.get('role', '') 
-        self.last_login = data.get('last_login') or datetime.now()
+        self.last_login = data.get('last_login') or datetime.datetime.now()
         
 class SessionSuperAdmin(User):
     def __init__(self, lname, password):