1. s3cmd
  2. Commit b97d4203ecd2ba0c1af8c913c0a8b65e3e5d140a
Browse code

* S3/S3Uri.py: Fixed cf:// uri parsing.

git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@478 830e0280-6d2a-0410-9c65-932aecc39d9d

Michal Ludvig authored on 2011/04/11 13:03:47
Showing 2 changed files
ChangeLog
History View file @ b97d420
... ... 
@@ -1,5 +1,6 @@
1 1 
 2011-04-11  Michal Ludvig  <mludvig@logix.net.nz>
2 2
3 
+	* S3/S3Uri.py: Fixed cf:// uri parsing.
3 4 
 	* S3/CloudFront.py: Don't fail if there are no cfinval
4 5 
 	  requests.
5 6
S3/S3Uri.py
History View file @ b97d420
... ... 
@@ -158,7 +158,7 @@ class S3UriFile(S3Uri):
158 158
159 159 
 class S3UriCloudFront(S3Uri):
160 160 
 	type = "cf"
161 
-	_re = re.compile("^cf://([^/]*)(/.*)?", re.IGNORECASE)
161 
+	_re = re.compile("^cf://([^/]*)/*(.*)", re.IGNORECASE)
162 162 
 	def __init__(self, string):
163 163 
 		match = self._re.match(string)
164 164 
 		if not match: