[Mpuls-commits] r466 - in wasko/trunk: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-04-02 17:26:32 +0200 (Thu, 02 Apr 2009)
New Revision: 466

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/controllers/case.py
Log:
Possible fix for issue150


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-04-02 14:54:08 UTC (rev 465)
+++ wasko/trunk/ChangeLog.txt	2009-04-02 15:26:32 UTC (rev 466)
@@ -1,5 +1,11 @@
 2009-04-02	Sascha L. Teichmann <teichmann at intevation.de>
 
+	Possible fix for issue150
+
+	* waskaweb/controllers/case.py: fix an unicode decode error.
+
+2009-04-02	Sascha L. Teichmann <teichmann at intevation.de>
+
 	Fixed issue149 (application part)
 
 	* waskaweb/model/casexml.py: Check uuid for being already anonymized before

Modified: wasko/trunk/waskaweb/controllers/case.py
===================================================================
--- wasko/trunk/waskaweb/controllers/case.py	2009-04-02 14:54:08 UTC (rev 465)
+++ wasko/trunk/waskaweb/controllers/case.py	2009-04-02 15:26:32 UTC (rev 466)
@@ -617,15 +617,14 @@
             c.url_ok       = h.url_for(controller="/case_overview")
             return render('/casemanagement/dialogs/success_xml_import.mako')
         except XMLImportException, err:
-            import traceback, sys
             traceback.print_exc(file = sys.stderr)
             c.error = err.errors
             c.failed_for  = IMPORT_FAILED
-            c.failed_text = unicode(err)
+            if type(err) == str: err = unicode(err, "UTF-8", "replace")
+            c.failed_text = err
             c.url_ok = "/case/importCase"
             return render('/casemanagement/dialogs/failed_xml_import2.mako')
         except:
-            import traceback, sys
             traceback.print_exc(file = sys.stderr)
             c.failed_for  = IMPORT_FAILED
             c.failed_text = IMPORT_FAILED_TEXT