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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2007-05-02 16:35:16 +0200 (Wed, 02 May 2007)
New Revision: 79

Modified:
   trunk/ChangeLog
   trunk/inteproxy/feesdialog.py
Log:
* inteproxy/feesdialog.py: Remove special case for missing title.
It should alway be present and it would make more sense to handle
this case in the caller.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-02 14:33:05 UTC (rev 78)
+++ trunk/ChangeLog	2007-05-02 14:35:16 UTC (rev 79)
@@ -1,5 +1,11 @@
 2007-05-02  Bernhard Herzog  <bh at intevation.de>
 
+	* inteproxy/feesdialog.py: Remove special case for missing title.
+	It should alway be present and it would make more sense to handle
+	this case in the caller.
+
+2007-05-02  Bernhard Herzog  <bh at intevation.de>
+
 	* inteproxy/transcoder.py (OWSProxyGETTranscoder.get_url): Only
 	modify the URL if the user didn't cancel the username/password
 	dialog

Modified: trunk/inteproxy/feesdialog.py
===================================================================
--- trunk/inteproxy/feesdialog.py	2007-05-02 14:33:05 UTC (rev 78)
+++ trunk/inteproxy/feesdialog.py	2007-05-02 14:35:16 UTC (rev 79)
@@ -38,11 +38,6 @@
     structures Service element"""
     t = etree.parse(StringIO(xml))
     title = t.findtext("Service/Title")
-    if not title:
-        # according to the DTD the Title must always be present,
-        # but who known what real servers do.  If the title is
-        # not present, we use the URL instead
-        title = remote_url
     fees = t.findtext("Service/Fees")
     access_constraints = t.findtext("Service/AccessConstraints")
     return (title, fees, access_constraints)