[Mpuls-commits] r2941 - in base/trunk: . mpulsweb/controllers mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-06-09 13:32:03 +0200 (Wed, 09 Jun 2010)
New Revision: 2941

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/navigation.py
   base/trunk/mpulsweb/lib/base.py
   base/trunk/mpulsweb/lib/dialogs.py
   base/trunk/mpulsweb/lib/security.py
Log:
* mpulsweb/controllers/navigation.py, mpulsweb/lib/base.py,
mpulsweb/lib/dialogs.py, mpulsweb/lib/security.py: Import HTTP
Exceptions from webob.exc instead of paste.httpexceptions.  The
ones from paste.httpexceptions are deprecated and do not work
properly with mpulsweb/controllers/error.py.  When one of the
paste.httpexceptions is used it leads to an exception in
webob/response.py ("AssertionError: Content-Length is different
from actual app_iter length") in code called
pulsweb/controllers/error.py.  Using the exception classes from
webob.exc fixes this.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-09 10:47:32 UTC (rev 2940)
+++ base/trunk/ChangeLog	2010-06-09 11:32:03 UTC (rev 2941)
@@ -1,5 +1,18 @@
 2010-06-09  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/navigation.py, mpulsweb/lib/base.py,
+	mpulsweb/lib/dialogs.py, mpulsweb/lib/security.py: Import HTTP
+	Exceptions from webob.exc instead of paste.httpexceptions.  The
+	ones from paste.httpexceptions are deprecated and do not work
+	properly with mpulsweb/controllers/error.py.  When one of the
+	paste.httpexceptions is used it leads to an exception in
+	webob/response.py ("AssertionError: Content-Length is different
+	from actual app_iter length") in code called
+	pulsweb/controllers/error.py.  Using the exception classes from
+	webob.exc fixes this.
+
+2010-06-09  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/model/user.py (UserObject.setData): The login name from
 	the data argument is the short login name stored in self.login,
 	not the full database login name for self.full_login.  Change the

Modified: base/trunk/mpulsweb/controllers/navigation.py
===================================================================
--- base/trunk/mpulsweb/controllers/navigation.py	2010-06-09 10:47:32 UTC (rev 2940)
+++ base/trunk/mpulsweb/controllers/navigation.py	2010-06-09 11:32:03 UTC (rev 2941)
@@ -31,7 +31,7 @@
 
 import logging
 
-from paste.httpexceptions import HTTPNotFound
+from webob.exc import HTTPNotFound
 
 from mpulsweb.lib.base import BaseController, session
 from mpulsweb.lib.navigation import mark_folderopen, mark_folderclose

Modified: base/trunk/mpulsweb/lib/base.py
===================================================================
--- base/trunk/mpulsweb/lib/base.py	2010-06-09 10:47:32 UTC (rev 2940)
+++ base/trunk/mpulsweb/lib/base.py	2010-06-09 11:32:03 UTC (rev 2941)
@@ -33,7 +33,7 @@
 import locale
 from time import time
 
-from paste.httpexceptions import HTTPUnauthorized, HTTPNotFound
+from webob.exc import HTTPUnauthorized, HTTPNotFound
 
 from pylons import c, config, g, request, response, session
 from pylons.controllers import WSGIController

Modified: base/trunk/mpulsweb/lib/dialogs.py
===================================================================
--- base/trunk/mpulsweb/lib/dialogs.py	2010-06-09 10:47:32 UTC (rev 2940)
+++ base/trunk/mpulsweb/lib/dialogs.py	2010-06-09 11:32:03 UTC (rev 2941)
@@ -3,7 +3,7 @@
 import logging
 from decorator import decorator
 
-from paste.httpexceptions import HTTPNotFound
+from webob.exc import HTTPNotFound
 
 from pylons import request, session, tmpl_context as c, app_globals as g
 from pylons.i18n import _

Modified: base/trunk/mpulsweb/lib/security.py
===================================================================
--- base/trunk/mpulsweb/lib/security.py	2010-06-09 10:47:32 UTC (rev 2940)
+++ base/trunk/mpulsweb/lib/security.py	2010-06-09 11:32:03 UTC (rev 2941)
@@ -42,7 +42,7 @@
 
 from decorator import decorator
 
-from paste.httpexceptions import HTTPUnauthorized
+from webob.exc import HTTPUnauthorized
 from pylons import request, session, config, g
 
 from mpulsweb.lib.db import DB, db, enter, leave