Log message for revision 68589:
removed patch for #1944 since the test failed
Changed:
U Zope/trunk/doc/CHANGES.txt
U Zope/trunk/lib/python/ZPublisher/HTTPRequest.py
U Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py
-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt 2006-06-12 05:31:36 UTC (rev 68588)
+++ Zope/trunk/doc/CHANGES.txt 2006-06-12 06:18:53 UTC (rev 68589)
@@ -31,4 +31,4 @@
- Collector #2073: fixed misbehaviour of OFS.Owned.changeOwnership
- - Collector #1944: HTTPRequest.resolve_url has error in raising errors
+
Modified: Zope/trunk/lib/python/ZPublisher/HTTPRequest.py
===================================================================
--- Zope/trunk/lib/python/ZPublisher/HTTPRequest.py 2006-06-12 05:31:36 UTC
(rev 68588)
+++ Zope/trunk/lib/python/ZPublisher/HTTPRequest.py 2006-06-12 06:18:53 UTC
(rev 68589)
@@ -1042,7 +1042,7 @@
except: rsp.exception()
if object is None:
req.close()
- raise sys.exc_info()[0], rsp.errmsg
+ raise rsp.errmsg, sys.exc_info()[1]
# The traversal machinery may return a "default object"
# like an index_html document. This is not appropriate
Modified: Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py
===================================================================
--- Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py 2006-06-12
05:31:36 UTC (rev 68588)
+++ Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py 2006-06-12
06:18:53 UTC (rev 68589)
@@ -701,19 +701,6 @@
f.seek(0)
self.assertEqual(f.xreadlines(),f)
- def testResolveUrl(self):
- # Check that ResolveUrl really raises the same error
- # it received from ZPublisher.BaseRequest.traverse
- # collector entry 1944
- from ZPublisher.HTTPRequest import HTTPRequest
- from zExceptions import NotFound
- env = TEST_ENVIRON.copy()
- req = HTTPRequest(None, env, None)
- req['PARENTS'] = ['Nobody', 'cares', 'here']
- testmethod = req.resolve_url
- self.assertRaises(NotFound, testmethod,
'http://localhost/does_not_exist')
-
-
def testDebug(self):
TEST_ENVIRON = {
'REQUEST_METHOD': 'GET',
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
