[Mpuls-commits] r999 - in wasko/branches/2.0: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-28 19:39:43 +0100 (Thu, 28 Jan 2010)
New Revision: 999

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/usersettings.py
Log:
* waskaweb/controllers/usersettings.py: Expand star imports.
Remove unused imports.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-28 18:36:33 UTC (rev 998)
+++ wasko/branches/2.0/ChangeLog	2010-01-28 18:39:43 UTC (rev 999)
@@ -1,5 +1,10 @@
 2010-01-28  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/usersettings.py: Expand star imports.
+	Remove unused imports.
+
+2010-01-28  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/controllers/usersettings.py: Fix formatting.
 
 2010-01-28  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/controllers/usersettings.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/usersettings.py	2010-01-28 18:36:33 UTC (rev 998)
+++ wasko/branches/2.0/waskaweb/controllers/usersettings.py	2010-01-28 18:39:43 UTC (rev 999)
@@ -32,12 +32,13 @@
 import logging
 import formencode
 
-from waskaweb.lib.base import *
+from waskaweb.lib.base import BaseController, c, h, render, request, session, _
+
 from waskaweb.lib.validators import BaseFormValidator, NewPasswordForm
 from waskaweb.lib.security import checkRole
 
-from waskaweb.model.user import UserListObject, UserObject, SessionSuperAdmin, \
-     UserGroupList, UserGroup
+from waskaweb.model.user import UserListObject, UserObject, UserGroupList, \
+     UserGroup
 
 
 log = logging.getLogger(__name__)