Download Install Tutorial Docs FAQ Tools WikiLicense Team IRC Planet Involvement Shop Book

Changeset 793

Show
Ignore:
Timestamp:
11/05/05 18:16:49
Author:
fumanchu
Message:

Made request.browserUrl a read-only property, since it is a calculated value. If you want to change its value now, change request.base, path, or queryString.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/cherrypy/_cperror.py

    r771 r793  
    5757                request.queryString = urllib.urlencode(params) 
    5858                request.paramMap = params.copy() 
    59          
    60         request.browserUrl = request.base + path 
    61         if request.queryString: 
    62             request.browserUrl += '?' + request.queryString 
    6359         
    6460        Exception.__init__(self, path, params) 
  • trunk/cherrypy/_cphttptools.py

    r790 r793  
    170170                raise cherrypy.HTTPError(400, msg) 
    171171        self.base = "%s://%s" % (self.scheme, self.headerMap.get('Host', '')) 
    172         self.browserUrl = self.base + self.path 
     172     
     173    def _get_browserUrl(self): 
     174        url = self.base + self.path 
    173175        if self.queryString: 
    174             self.browserUrl += '?' + self.queryString 
     176            url += '?' + self.queryString 
     177        return url 
     178    browserUrl = property(_get_browserUrl, 
     179                          doc="The URL as entered in a browser (read-only).") 
    175180     
    176181    def processBody(self): 
  • trunk/cherrypy/lib/filter/baseurlfilter.py

    r768 r793  
    2424            newBaseUrl = request.base[:request.base.find("://") + 3] + newBaseUrl 
    2525         
    26         request.browserUrl = request.browserUrl.replace(request.base, newBaseUrl) 
    2726        request.base = newBaseUrl 

Hosted by WebFaction

Log in as guest/cpguest to create tickets