Changeset 1365

Timestamp:

09/14/06 13:12:17

Author:

fumanchu

Message:

Removed app.guess_abs_path. Use cherrypy.url(script_name=app.script_name) instead.

Files:

• trunk/cherrypy/__init__.py (modified) (1 diff)
• trunk/cherrypy/_cptree.py (modified) (1 diff)

trunk/cherrypy/__init__.py

@@ -196 +196 @@
-                    host = socket.gethostname()
-                port = server.socket_port
-(port in (443, 8443) or server.ssl_certificate)
+server.ssl_certificate
-                    scheme = "https"
-                    if port != 443:

trunk/cherrypy/_cptree.py

@@ -54 +54 @@
-            if namespace in self.namespaces:
-                self.namespaces[namespace](atoms[1], v)
-    
-    def guess_abs_path(self):
-        """Guess the absolute URL from server.socket_host and script_name.
-        
-        When inside a request, the abs_path can be formed via:
-            cherrypy.request.base + (cherrypy.request.app.script_name or "/")
-        
-        However, outside of the request we must guess, hoping the deployer
-        set socket_host and socket_port correctly.
-        """
-        port = cherrypy.server.socket_port
-        if port in (443, 8443):
-            scheme = "https://"
-        else:
-            scheme = "http://"
-        host = cherrypy.server.socket_host
-        if port != 80:
-            host += ":%s" % port
-        return scheme + host + (self.script_name or "/")
-    
-    def wsgiapp(self, environ, start_response):