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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-15 11:46:30 +0100 (Mon, 15 Feb 2010)
New Revision: 1546

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/model/case.py
Log:
* waskaweb/model/case.py: Import from mpulsweb.lib.base directly,
not from waskaweb.lib.base.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-15 10:41:20 UTC (rev 1545)
+++ wasko/branches/2.0/ChangeLog	2010-02-15 10:46:30 UTC (rev 1546)
@@ -1,5 +1,10 @@
 2010-02-15  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/model/case.py: Import from mpulsweb.lib.base directly,
+	not from waskaweb.lib.base.
+
+2010-02-15  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/model/case.py: Rearrange imports, grouping the mpulsweb
 	and waskaweb imports separately
 

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-02-15 10:41:20 UTC (rev 1545)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-02-15 10:46:30 UTC (rev 1546)
@@ -44,6 +44,7 @@
 from formed.meta.data import RepeatNode
 from formed.meta import UNKNOWN_DATE
 
+from mpulsweb.lib.base import session, g
 from mpulsweb.lib.helpers import ensure_unicode
 from mpulsweb.lib.db import db, PostgresDBInterface
 
@@ -53,7 +54,6 @@
 
 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