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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-26 12:22:06 +0100 (Tue, 26 Jan 2010)
New Revision: 872

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/case.py
Log:
* waskaweb/controllers/case.py: Expand star imports.  Import sys
explicitly instead of importing it from waskaweb.lib.base.
Nothing from waskaweb.lib.evaluation is actually used in case.py.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-26 11:17:53 UTC (rev 871)
+++ wasko/branches/2.0/ChangeLog	2010-01-26 11:22:06 UTC (rev 872)
@@ -1,5 +1,11 @@
 2010-01-26  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/case.py: Expand star imports.  Import sys
+	explicitly instead of importing it from waskaweb.lib.base.
+	Nothing from waskaweb.lib.evaluation is actually used in case.py.
+
+2010-01-26  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/controllers/case.py: Remove unused string constants
 
 2010-01-26  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case.py	2010-01-26 11:17:53 UTC (rev 871)
+++ wasko/branches/2.0/waskaweb/controllers/case.py	2010-01-26 11:22:06 UTC (rev 872)
@@ -29,6 +29,7 @@
 # Sascha L. Teichmann <teichmann at intevation.de>
 #
 
+import sys
 import traceback
 import logging
 from datetime  import datetime
@@ -38,10 +39,11 @@
 import paste
 from paste.httpexceptions import HTTPNotFound
 
-from waskaweb.lib.base import *
+from waskaweb.lib.base import c, g, h, redirect_to, render, request, session
+
 from waskaweb.lib.db import db
 from waskaweb.lib.search import INCONSISTENCY_CHECK_AFTER
-from waskaweb.lib.evaluation import *
+
 from waskaweb.lib.helpers import dd_mm_YYYY, HH_MM
 from waskaweb.lib.navigation import get_navigation
 from waskaweb.lib.security import checkRole
@@ -50,9 +52,12 @@
      SetEditorForm, CreateAppointmentForm, CreateLogbookForm, EditLogbookForm,\
      SetPhaseForm, WiederaufnahmeCaseForm, NeuaufnahmeCaseForm
 
-from waskaweb.model.user import *
-from waskaweb.model.statement import *
-from waskaweb.model.case import *
+from waskaweb.model.user import UserGroupList, UserListObject
+
+from waskaweb.model.statement import PrivacyStatement
+
+from waskaweb.model.case import Agency, CaseFactory, SessionCase
+
 #from waskaweb.model.casexml import import_xml, XMLImportException
 from waskaweb.model.appointment import CaseAppointmentOverview, \
      CaseAppointmentFactory, CaseReminderOverview