[Zope-Checkins] SVN: Zope/branches/2.10/ removed patch for #1944 since the tests broke

[Andreas Jung]

Log message for revision 68590:
  removed patch for #1944 since the tests broke
        
  

Changed:
  U   Zope/branches/2.10/doc/CHANGES.txt
  U   Zope/branches/2.10/lib/python/ZPublisher/HTTPRequest.py
  U   Zope/branches/2.10/lib/python/ZPublisher/tests/testHTTPRequest.py

-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.10/doc/CHANGES.txt	2006-06-12 06:18:53 UTC (rev 68589)
+++ Zope/branches/2.10/doc/CHANGES.txt	2006-06-12 06:19:59 UTC (rev 68590)
@@ -33,8 +33,6 @@
 
       - Collector #2073: fixed misbehaviour of OFS.Owned.changeOwnership
 
-      - Collector #1944: HTTPRequest.resolve_url has error in raising errors
-
   Zope 2.10.0 beta 1 (2006/05/30)
 
     Restructuring

Modified: Zope/branches/2.10/lib/python/ZPublisher/HTTPRequest.py
===================================================================
--- Zope/branches/2.10/lib/python/ZPublisher/HTTPRequest.py	2006-06-12 06:18:53 UTC (rev 68589)
+++ Zope/branches/2.10/lib/python/ZPublisher/HTTPRequest.py	2006-06-12 06:19:59 UTC (rev 68590)
@@ -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/branches/2.10/lib/python/ZPublisher/tests/testHTTPRequest.py
===================================================================
--- Zope/branches/2.10/lib/python/ZPublisher/tests/testHTTPRequest.py	2006-06-12 06:18:53 UTC (rev 68589)
+++ Zope/branches/2.10/lib/python/ZPublisher/tests/testHTTPRequest.py	2006-06-12 06:19:59 UTC (rev 68590)
@@ -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',