[Inteproxy-commits] r108 - in trunk: . inteproxy

[scm-commit@wald.intevation.org]

Author: bh
Date: 2008-02-05 18:06:31 +0100 (Tue, 05 Feb 2008)
New Revision: 108

Modified:
   trunk/ChangeLog
   trunk/inteproxy/feesdialog.py
Log:
* inteproxy/feesdialog.py (handle_fees_and_access_constraints):
Only attempt to handle the response if the request was successful.
Trying to parse error responses as a GetCapabilities XML
structure won't work.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-23 18:50:26 UTC (rev 107)
+++ trunk/ChangeLog	2008-02-05 17:06:31 UTC (rev 108)
@@ -1,3 +1,10 @@
+2008-02-05  Bernhard Herzog  <bh at intevation.de>
+
+	* inteproxy/feesdialog.py (handle_fees_and_access_constraints):
+	Only attempt to handle the response if the request was successful.
+	Trying to parse error responses as a GetCapabilities XML structure
+	won't work.
+
 2007-10-23  Bernhard Herzog  <bh at intevation.de>
 
 	* demo.cfg: Explain how to deal with multiple server on the same

Modified: trunk/inteproxy/feesdialog.py
===================================================================
--- trunk/inteproxy/feesdialog.py	2007-10-23 18:50:26 UTC (rev 107)
+++ trunk/inteproxy/feesdialog.py	2008-02-05 17:06:31 UTC (rev 108)
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 by Intevation GmbH
+# Copyright (C) 2007, 2008 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh at intevation.de>
 #
@@ -66,6 +66,11 @@
     """
     response_read = response.read
 
+    # only try to handle anything for successful requests.
+    # Should we allow any other success response codes?
+    if response.code != 200:
+        return response_read
+
     if remote_url in dialog_shown_for:
         return response_read