openstack/swift
Code Issues Proposed changes

Assignment to reserved built-in symbol

Browse Source 
Built-in symbol: file, format, range etc was re-assigned as local vars
in files: test/functional/swift_test_client.py and
test/functional/tests.py, rename these local vars.

Fixes bug #1208078

Change-Id: I627894cd722bd32cad231d534cbe97a0412c7cc9
This commit is contained in:
Wu Wenxiang
2013-08-04 11:15:53 +08:00
parent 3741fbe779
commit 69f9f9e88a
2 changed files with 348 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
test/functional/swift_test_client.py
View File

@@ -314,21 +314,21 @@ class Account(Base):
return Container(self.conn, self.name, container_name) return Container(self.conn, self.name, container_name)
def containers(self, hdrs={}, parms={}, cfg={}): def containers(self, hdrs={}, parms={}, cfg={}):
format = parms.get('format', None) format_type = parms.get('format', None)
if format not in [None, 'json', 'xml']: if format_type not in [None, 'json', 'xml']:
raise RequestError('Invalid format: %s' % format) raise RequestError('Invalid format: %s' % format_type)
if format is None and 'format' in parms: if format_type is None and 'format' in parms:
del parms['format'] del parms['format']
status = self.conn.make_request('GET', self.path, hdrs=hdrs, status = self.conn.make_request('GET', self.path, hdrs=hdrs,
parms=parms, cfg=cfg) parms=parms, cfg=cfg)
if status == 200: if status == 200:
if format == 'json': if format_type == 'json':
conts = json.loads(self.conn.response.read()) conts = json.loads(self.conn.response.read())
for cont in conts: for cont in conts:
cont['name'] = cont['name'].encode('utf-8') cont['name'] = cont['name'].encode('utf-8')
return conts return conts
elif format == 'xml': elif format_type == 'xml':
conts = [] conts = []
tree = minidom.parseString(self.conn.response.read()) tree = minidom.parseString(self.conn.response.read())
for x in tree.getElementsByTagName('container'): for x in tree.getElementsByTagName('container'):
@@ -391,8 +391,8 @@ class Container(Base):
def delete_files(self): def delete_files(self):
for f in listing_items(self.files): for f in listing_items(self.files):
file = self.file(f) file_item = self.file(f)
if not file.delete(): if not file_item.delete():
return False return False
return listing_empty(self.files) return listing_empty(self.files)
@@ -404,37 +404,39 @@ class Container(Base):
return File(self.conn, self.account, self.name, file_name) return File(self.conn, self.account, self.name, file_name)
def files(self, hdrs={}, parms={}, cfg={}): def files(self, hdrs={}, parms={}, cfg={}):
format = parms.get('format', None) format_type = parms.get('format', None)
if format not in [None, 'json', 'xml']: if format_type not in [None, 'json', 'xml']:
raise RequestError('Invalid format: %s' % format) raise RequestError('Invalid format: %s' % format_type)
if format is None and 'format' in parms: if format_type is None and 'format' in parms:
del parms['format'] del parms['format']
status = self.conn.make_request('GET', self.path, hdrs=hdrs, status = self.conn.make_request('GET', self.path, hdrs=hdrs,
parms=parms, cfg=cfg) parms=parms, cfg=cfg)
if status == 200: if status == 200:
if format == 'json': if format_type == 'json':
files = json.loads(self.conn.response.read()) files = json.loads(self.conn.response.read())
for file in files: for file_item in files:
file['name'] = file['name'].encode('utf-8') file_item['name'] = file_item['name'].encode('utf-8')
file['content_type'] = file['content_type'].encode('utf-8') file_item['content_type'] = file_item['content_type'].\
encode('utf-8')
return files return files
elif format == 'xml': elif format_type == 'xml':
files = [] files = []
tree = minidom.parseString(self.conn.response.read()) tree = minidom.parseString(self.conn.response.read())
for x in tree.getElementsByTagName('object'): for x in tree.getElementsByTagName('object'):
file = {} file_item = {}
for key in ['name', 'hash', 'bytes', 'content_type', for key in ['name', 'hash', 'bytes', 'content_type',
'last_modified']: 'last_modified']:
file[key] = x.getElementsByTagName(key)[0].\ file_item[key] = x.getElementsByTagName(key)[0].\
childNodes[0].nodeValue childNodes[0].nodeValue
files.append(file) files.append(file_item)
for file in files: for file_item in files:
file['name'] = file['name'].encode('utf-8') file_item['name'] = file_item['name'].encode('utf-8')
file['content_type'] = file['content_type'].encode('utf-8') file_item['content_type'] = file_item['content_type'].\
encode('utf-8')
return files return files
else: else:
content = self.conn.response.read() content = self.conn.response.read()
@@ -601,11 +603,11 @@ class File(Base):
callback=None, cfg={}): callback=None, cfg={}):
if size > 0: if size > 0:
range = 'bytes=%d-%d' % (offset, (offset + size) - 1) range_string = 'bytes=%d-%d' % (offset, (offset + size) - 1)
if hdrs: if hdrs:
hdrs['Range'] = range hdrs['Range'] = range_string
else: else:
hdrs = {'Range': range} hdrs = {'Range': range_string}
status = self.conn.make_request('GET', self.path, hdrs=hdrs, status = self.conn.make_request('GET', self.path, hdrs=hdrs,
cfg=cfg) cfg=cfg)

627
test/functional/tests.py
View File

File diff suppressed because it is too large Load Diff