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

[scm-commit@wald.intevation.org]

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

Modified:
   trunk/ChangeLog
   trunk/inteproxy/transcoder.py
Log:
* inteproxy/transcoder.py (OWSProxyGETTranscoder.get_url): Only
modify the URL if the user didn't cancel the username/password
dialog


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-02 14:10:41 UTC (rev 77)
+++ trunk/ChangeLog	2007-05-02 14:33:05 UTC (rev 78)
@@ -1,5 +1,11 @@
 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
+
+2007-05-02  Bernhard Herzog  <bh at intevation.de>
+
 	* inteproxy/getpassword.py (get_password_with_cache): Only add
 	username/password to the cache if the user didn't cancel.
 

Modified: trunk/inteproxy/transcoder.py
===================================================================
--- trunk/inteproxy/transcoder.py	2007-05-02 14:10:41 UTC (rev 77)
+++ trunk/inteproxy/transcoder.py	2007-05-02 14:33:05 UTC (rev 78)
@@ -86,14 +86,15 @@
         scheme, netloc, path, query, fragment = self.spliturl
         if self.method == "GET":
             user, password = self.get_password()
-            # FIXME: quote username and password properly
-            if query:
-                split_query = query.split("&")
-            else:
-                split_query = []
-            query = "&".join(split_query
-                             + ["user=%s" % quote_plus(user),
-                                "password=%s" % quote_plus(password)])
+            # FIXME: what do we do if the user cancelled?
+            if user is not None:
+                if query:
+                    split_query = query.split("&")
+                else:
+                    split_query = []
+                query = "&".join(split_query
+                                 + ["user=%s" % quote_plus(user),
+                                    "password=%s" % quote_plus(password)])
         return urlparse.urlunsplit((scheme, netloc, path, query, fragment))