git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@414 830e0280-6d2a-0410-9c65-932aecc39d9d
Michal Ludvig authored on 2010/05/26 20:41:08... | ... |
@@ -184,18 +184,18 @@ class S3(object): |
184 | 184 |
|
185 | 185 |
while truncated: |
186 | 186 |
response = self.bucket_list_noparse(bucket, prefix, recursive, uri_params) |
187 |
- curList = _get_contents(response["data"]) |
|
188 |
- curPrefixes = _get_common_prefixes(response["data"]) |
|
187 |
+ current_list = _get_contents(response["data"]) |
|
188 |
+ current_prefixes = _get_common_prefixes(response["data"]) |
|
189 | 189 |
truncated = _list_truncated(response["data"]) |
190 | 190 |
if truncated: |
191 |
- if curList: |
|
192 |
- uri_params['marker'] = self.urlencode_string( curList[-1]["Key"] ) |
|
191 |
+ if current_list: |
|
192 |
+ uri_params['marker'] = self.urlencode_string(current_list[-1]["Key"]) |
|
193 | 193 |
else: |
194 |
- uri_params['marker'] = self.urlencode_string( curPrefixes[-1]["Prefix"] ) |
|
194 |
+ uri_params['marker'] = self.urlencode_string(current_prefixes[-1]["Prefix"]) |
|
195 | 195 |
debug("Listing continues after '%s'" % uri_params['marker']) |
196 | 196 |
|
197 |
- list += curList |
|
198 |
- prefixes += curPrefixes |
|
197 |
+ list += current_list |
|
198 |
+ prefixes += current_prefixes |
|
199 | 199 |
|
200 | 200 |
response['list'] = list |
201 | 201 |
response['common_prefixes'] = prefixes |