[Mpuls-commits] r3376 - in wasko/trunk: . waskoweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-11 12:50:43 +0200 (Wed, 11 Aug 2010)
New Revision: 3376

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/controllers/formularpage.py
Log:
* waskoweb/controllers/formularpage.py: Various import fixes:
remove unused imports, reorder imports to conform to mpuls
conventions, expand star-imports, add log object which was
implicitly iported from mpulsweb.controllers.formularpage


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2010-08-11 10:46:29 UTC (rev 3375)
+++ wasko/trunk/ChangeLog	2010-08-11 10:50:43 UTC (rev 3376)
@@ -1,5 +1,12 @@
 2010-08-11  Bernhard Herzog  <bh at intevation.de>
 
+	* waskoweb/controllers/formularpage.py: Various import fixes:
+	remove unused imports, reorder imports to conform to mpuls
+	conventions, expand star-imports, add log object which was
+	implicitly iported from mpulsweb.controllers.formularpage
+
+2010-08-11  Bernhard Herzog  <bh at intevation.de>
+
 	* waskoweb/templates/casemanagement/main.mako: adapt to changes in
 	mpuls base: import render_navigation explicitly from
 	mpulsweb.lib.navigation as it's not available in helpers anymore.

Modified: wasko/trunk/waskoweb/controllers/formularpage.py
===================================================================
--- wasko/trunk/waskoweb/controllers/formularpage.py	2010-08-11 10:46:29 UTC (rev 3375)
+++ wasko/trunk/waskoweb/controllers/formularpage.py	2010-08-11 10:50:43 UTC (rev 3376)
@@ -29,48 +29,38 @@
 #
 
 import logging
-import traceback
-from cgi import escape
 import datetime
 
-import formencode
+import psycopg2
 
-from pylons import request, session, c
-from pylons import g
-from mpulsweb.lib.translation import _
-from pylons.controllers.util import abort, redirect_to
+from pylons import request, session, c, g
+from pylons.controllers.util import redirect_to
 
-from mpulsweb.controllers.formularpage import *
+from formed.instance.backends.postgres import DBFactory as InstanceFactory
+from formed.instance.tree import SetDataException
 
-from mpulsweb.lib.security import checkRole
-
-from formed.instance.backends.postgres import DBFactory as InstanceFactory, \
-    DBRepeatInstanceNode as RepeatInstanceNode
-from formed.instance.tree import SetDataException, RepeatInstanceContainerNode
-
-
 from mpulsweb.lib.translation import _
 from mpulsweb.lib.security import checkRole
-from mpulsweb.lib.db import  PostgresDBInterface
-from mpulsweb.lib.navigation import  mark_folderopen
+from mpulsweb.lib.db import db, PostgresDBInterface
+from mpulsweb.lib.base import render
+from mpulsweb.lib.renderer import apply_hidden_booleans
+from mpulsweb.lib.helpers import url_for
 
-from mpulsweb.lib.base import BaseController, render
-from mpulsweb.lib.renderer import ViewRenderer, RepeatGroupRenderer, \
-    ErrorRenderer, apply_hidden_booleans, get_child_num
-from mpulsweb.lib.helpers import url_for, dd_mm_YYYY as format_date
-
+from mpulsweb.model.appointment import CaseAppointmentFactory
 from mpulsweb.model.phase import PhaseFactory, \
-    PC_MANUAL, PC_HALFAUTO, PC_FULLAUTO, \
+    PC_MANUAL, PC_FULLAUTO, \
     DIALOG_FULLAUTOMATIC_CHANGE_TITLE, DIALOG_FULLAUTOMATIC_CHANGE_TEXT, \
     DIALOG_HALFAUTOMATIC_CHANGE_TITLE, DIALOG_HALFAUTOMATIC_CHANGE_TEXT
 
-from mpulsweb.model.appointment import CaseAppointmentFactory
+from mpulsweb.controllers.formularpage import FormularpageController, \
+     convert2dic
 
 from waskoweb.model.agencysettings import Agency
-from mpulsweb.lib.db import db
-import psycopg2 
 
 
+log = logging.getLogger(__name__)
+
+
 class FormularpageController(FormularpageController):
     @checkRole(('cm_ka'))
     def save(self):