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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-26 20:47:32 +0100 (Tue, 26 Jan 2010)
New Revision: 935

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/model/phases_factory.py
Log:
* waskaweb/model/phases_factory.py: Expand star imports.  Remove
unused imports


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-26 19:43:48 UTC (rev 934)
+++ wasko/branches/2.0/ChangeLog	2010-01-26 19:47:32 UTC (rev 935)
@@ -1,5 +1,10 @@
 2010-01-26  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/model/phases_factory.py: Expand star imports.  Remove
+	unused imports
+
+2010-01-26  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/model/phases_factory.py: Fix formatting
 
 2010-01-26  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/model/phases_factory.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/phases_factory.py	2010-01-26 19:43:48 UTC (rev 934)
+++ wasko/branches/2.0/waskaweb/model/phases_factory.py	2010-01-26 19:47:32 UTC (rev 935)
@@ -28,14 +28,12 @@
 # Sascha L. Teichmann <sascha.teichmann at intevation.de>
 #
 
-import sys
-import re
-import traceback
 from xml.sax.saxutils import quoteattr
 from cgi import escape
 
-from waskaweb.model.phases import *
-from waskaweb.model.phase_transition import *
+from waskaweb.model.phases import Phase, PhasePair
+from waskaweb.model.phase_transition import CLEAR_ENDE, CLEAR_START, CM_ENDE, \
+     CM_START, NB_ENDE, NB_START, phase_predecessors, phase_symbol
 
 #from waskaweb.model.data import PageNode