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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-08 12:46:43 +0100 (Mon, 08 Feb 2010)
New Revision: 1315

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/logbook.py
Log:
* waskaweb/controllers/logbook.py: Expand star imports.  Added an
explicit import sys because the sys module was implicitly imported
from bwaskaweb.lib.base.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-08 11:46:01 UTC (rev 1314)
+++ wasko/branches/2.0/ChangeLog	2010-02-08 11:46:43 UTC (rev 1315)
@@ -1,5 +1,11 @@
 2010-02-08  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/logbook.py: Expand star imports.  Added an
+	explicit import sys because the sys module was implicitly imported
+	from bwaskaweb.lib.base.
+
+2010-02-08  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/controllers/phase.py: Expand star imports.
 
 2010-02-08  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/controllers/logbook.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/logbook.py	2010-02-08 11:46:01 UTC (rev 1314)
+++ wasko/branches/2.0/waskaweb/controllers/logbook.py	2010-02-08 11:46:43 UTC (rev 1315)
@@ -23,15 +23,19 @@
 # within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
 # the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and 
 # European Social Fund resources.
+
+import sys
 import logging
 import formencode
 from datetime import datetime
 
-from waskaweb.lib.base import *
 from mpulsweb.lib.security import checkRole
+
+from waskaweb.lib.base import BaseController, c, render, request, session
 from waskaweb.lib.validators import CreateLogbookForm, EditLogbookForm
 from waskaweb.model.logbook import Logbook, LogbookEntry, LogbookEntryChecker
 
+
 LOGBOOK_ENTRY_CREATE_FAILED = u"Tagebucheintrag wurde nicht angelegt!"
 LOGBOOK_ENTRY_CREATE_FAILED_TEXT = u"\
 Beim Anlegen eines Tagebucheintrages is ein Fehler aufgetreten."