[Mpuls-commits] r1545 - in wasko/branches/2.0: . waskaweb/model

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-15 11:41:20 +0100 (Mon, 15 Feb 2010)
New Revision: 1545

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/model/case.py
Log:
* waskaweb/model/case.py: Rearrange imports, grouping the mpulsweb
and waskaweb imports separately


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-15 08:59:51 UTC (rev 1544)
+++ wasko/branches/2.0/ChangeLog	2010-02-15 10:41:20 UTC (rev 1545)
@@ -1,3 +1,8 @@
+2010-02-15  Bernhard Herzog  <bh at intevation.de>
+
+	* waskaweb/model/case.py: Rearrange imports, grouping the mpulsweb
+	and waskaweb imports separately
+
 2010-02-12  Bernhard Herzog  <bh at intevation.de>
 
 	* waskaweb/model/case.py (Field.__init__): New parameter and

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-02-15 08:59:51 UTC (rev 1544)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-02-15 10:41:20 UTC (rev 1545)
@@ -44,23 +44,26 @@
 from formed.meta.data import RepeatNode
 from formed.meta import UNKNOWN_DATE
 
-from waskaweb.lib.base import session, g
 from mpulsweb.lib.helpers import ensure_unicode
 from mpulsweb.lib.db import db, PostgresDBInterface
+
+from mpulsweb.model.user import UserObject
+from mpulsweb.model.agencysettings import Agency
+from mpulsweb.model.document import listDocuments
+
+from mpulsweb.controllers.formularpage import convert2dic
+
+from waskaweb.lib.base import session, g
 from waskaweb.lib.search import CaseSearch
 #from waskaweb.lib.csv import exportAsCSV
 #from waskaweb.lib.excel import exportAsXLS
 #from waskaweb.lib.xmlexport import exportAsXML
 
-from mpulsweb.model.user import UserObject
-from mpulsweb.model.agencysettings import Agency
-from mpulsweb.model.document import listDocuments
 from waskaweb.model.statement import PrivacyStatement, DiscretionStatement
 from waskaweb.model.phase_transition import phase_description, phase_end, \
      CM_START, CLEAR_START, CLEAR_ENDE
 from waskaweb.model.phases_factory import RequiredFields
 
-from mpulsweb.controllers.formularpage import convert2dic
 
 log = logging.getLogger(__name__)