[Zope-Checkins] CVS: Zope2 - Resource.py:1.42

[Brian Lloyd]

Update of /cvs-repository/Zope2/lib/python/webdav
In directory korak:/home/brian/temp/mainline_test/lib/python/webdav

Modified Files:
	Resource.py 
Log Message:
merged cleanups of physicalPathFromUrl api



--- Updated File Resource.py in package Zope2 --
--- Resource.py	2001/03/27 19:26:28	1.41
+++ Resource.py	2001/03/27 19:52:11	1.42
@@ -350,8 +350,8 @@
         if not dest:
             raise 'Bad Request', 'Invalid Destination header.'
 
-        path, (bad1, bad2, pct) = REQUEST.physicalPathFromURL(dest)
-        if pct < 1 or bad2:
+        try: path = REQUEST.physicalPathFromURL(dest)
+        except ValueError:
             raise 'Bad Request', 'Invalid Destination header'
 
         name = path.pop()
@@ -434,9 +434,11 @@
             raise 'Method Not Allowed', 'This object may not be moved.'
 
         dest=REQUEST.get_header('Destination', '')
-        path, (bad1, bad2, pct) = REQUEST.physicalPathFromURL(dest)
-        if pct < 1 or bad2:
+
+        try: path = REQUEST.physicalPathFromURL(dest)
+        except ValueError:
             raise 'Bad Request', 'No destination given'
+
         flag=REQUEST.get_header('Overwrite', 'F')
         flag=string.upper(flag)