SVN: r25194 - trunk/quixote

Author: nascheme
Date: 2004-09-24 14:06:11 -0400 (Fri, 24 Sep 2004)
New Revision: 25194

Modified:
   trunk/quixote/http_request.py
Log:
Add get_scheme() method.


Modified: trunk/quixote/http_request.py
===================================================================
--- trunk/quixote/http_request.py	2004-09-24 17:25:55 UTC (rev 25193)
+++ trunk/quixote/http_request.py	2004-09-24 18:06:11 UTC (rev 25194)
@@ -196,6 +196,9 @@
     def formiter (self):
         return self.form.iteritems()
 
+    def get_scheme (self):
+        return self.scheme
+
     # The following environment variables are useful for reconstructing
     # the original URL, all of which are specified by CGI 1.1:
     #
@@ -216,8 +219,8 @@
         server_name = self.environ["SERVER_NAME"].strip()
         server_port = self.environ.get("SERVER_PORT")
         if (not server_port or
-            (self.scheme == "http" and server_port == "80") or
-            (self.scheme == "https" and server_port == "443")):
+            (self.get_scheme() == "http" and server_port == "80") or
+            (self.get_scheme() == "https" and server_port == "443")):
             return server_name
         else:
             return server_name + ":" + server_port
@@ -269,7 +272,7 @@
         "http://foo.com/bar".  Does not include the query string (if
         any).
         """
-        return "%s://%s%s" % (self.scheme, self.get_server(),
+        return "%s://%s%s" % (self.get_scheme(), self.get_server(),
                               urllib.quote(self.get_path(n)))
 
     def get_environ (self, key, default=None):