Log message for revision 112594: Merge further janitorial changes from 2.12 branch.
Changed: U Zope/trunk/src/Products/SiteAccess/VirtualHostMonster.py U Zope/trunk/src/Products/SiteAccess/tests/testVirtualHostMonster.py -=- Modified: Zope/trunk/src/Products/SiteAccess/VirtualHostMonster.py =================================================================== --- Zope/trunk/src/Products/SiteAccess/VirtualHostMonster.py 2010-05-20 22:41:16 UTC (rev 112593) +++ Zope/trunk/src/Products/SiteAccess/VirtualHostMonster.py 2010-05-20 22:41:18 UTC (rev 112594) @@ -58,8 +58,9 @@ try: host, path = [x.strip() for x in line.split('/', 1)] except: - raise ValueError, ( - 'Line needs a slash between host and path: %s' % line ) + raise ValueError( + 'Line needs a slash between host and path: %s' + % line ) pp = filter(None, path.split( '/')) if pp: obpath = pp[:] @@ -105,7 +106,8 @@ self.lines = tuple(new_lines) self.have_map = not not (fixed_map or sub_map) # booleanize if RESPONSE is not None: - RESPONSE.redirect('manage_edit?manage_tabs_message=Changes%20Saved.') + RESPONSE.redirect( + 'manage_edit?manage_tabs_message=Changes%20Saved.') def addToContainer(self, container): container._setObject(self.id, self) @@ -195,15 +197,17 @@ vh_part = path.pop(0)[1:] if vh_part: request['VIRTUAL_URL_PARTS'] = vup = ( - request['SERVER_URL'], vh_part, quote('/'.join(path))) + request['SERVER_URL'], + vh_part, quote('/'.join(path))) else: request['VIRTUAL_URL_PARTS'] = vup = ( request['SERVER_URL'], quote('/'.join(path))) request['VIRTUAL_URL'] = '/'.join(vup) # new ACTUAL_URL - add = (path and request['ACTUAL_URL'].endswith('/')) and '/' or '' - request['ACTUAL_URL'] = request['VIRTUAL_URL']+add + add = (path and + request['ACTUAL_URL'].endswith('/')) and '/' or '' + request['ACTUAL_URL'] = request['VIRTUAL_URL'] + add return vh_used = 1 # Only retry once. Modified: Zope/trunk/src/Products/SiteAccess/tests/testVirtualHostMonster.py =================================================================== --- Zope/trunk/src/Products/SiteAccess/tests/testVirtualHostMonster.py 2010-05-20 22:41:16 UTC (rev 112593) +++ Zope/trunk/src/Products/SiteAccess/tests/testVirtualHostMonster.py 2010-05-20 22:41:18 UTC (rev 112594) @@ -51,24 +51,49 @@ m = self.app.folder.doc.getPhysicalPath self.assertEqual(m(), ('', 'folder', 'doc')) - def test_actual_url(self): - self.app.folder.manage_addDTMLMethod('index_html', '') + def test_actual_url_no_VHR_no_doc_w_trailing_slash(self): + ob = self.traverse('/VirtualHostBase/http/www.mysite.com:80' + '/folder/') + self.assertEqual(self.app.REQUEST['ACTUAL_URL'], + 'http://www.mysite.com/folder/') + def test_actual_url_no_VHR_no_doc_no_trailing_slash(self): ob = self.traverse('/VirtualHostBase/http/www.mysite.com:80' + '/folder') + self.assertEqual(self.app.REQUEST['ACTUAL_URL'], + 'http://www.mysite.com/folder') + + def test_actual_url_no_VHR_w_doc_w_trailing_slash(self): + ob = self.traverse('/VirtualHostBase/http/www.mysite.com:80' + '/folder/doc/') + self.assertEqual(self.app.REQUEST['ACTUAL_URL'], + 'http://www.mysite.com/folder/doc/') + + def test_actual_url_no_VHR_w_doc_no_trailing_slash(self): + ob = self.traverse('/VirtualHostBase/http/www.mysite.com:80' + '/folder/doc') + self.assertEqual(self.app.REQUEST['ACTUAL_URL'], + 'http://www.mysite.com/folder/doc') + + def test_actual_url_w_VHR_w_doc_w_trailing_slash(self): + ob = self.traverse('/VirtualHostBase/http/www.mysite.com:80' '/folder/VirtualHostRoot/doc/') self.assertEqual(self.app.REQUEST['ACTUAL_URL'], 'http://www.mysite.com/doc/') + def test_actual_url_w_VHR_w_doc_no_trailing_slash(self): ob = self.traverse('/VirtualHostBase/http/www.mysite.com:80' '/folder/VirtualHostRoot/doc') self.assertEqual(self.app.REQUEST['ACTUAL_URL'], 'http://www.mysite.com/doc') + def test_actual_url_w_VHR_no_doc_w_trailing_slash(self): ob = self.traverse('/VirtualHostBase/http/www.mysite.com:80' '/folder/VirtualHostRoot/') self.assertEqual(self.app.REQUEST['ACTUAL_URL'], 'http://www.mysite.com/') + def test_actual_url_w_VHR_w_doc_no_trailing_slash(self): ob = self.traverse('/VirtualHostBase/http/www.mysite.com:80' '/folder/VirtualHostRoot') self.assertEqual(self.app.REQUEST['ACTUAL_URL'], _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins