openstack/swift
Code Issues Proposed changes

Merge "Remove redefinition of import traceback"

Browse Source
This commit is contained in:
Jenkins 2012-08-27 20:23:11 +00:00 committed by Gerrit Code Review
commit e630e7c9d6
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -79,3 +79,4 @@ Doug Weimer (dweimer@gmail.com)
Cory Wright (cory.wright@rackspace.com) Cory Wright (cory.wright@rackspace.com)
Ye Jia Xu (xyj.asmy@gmail.com) Ye Jia Xu (xyj.asmy@gmail.com)
Pete Zaitcev (zaitcev@kotori.zaitcev.us) Pete Zaitcev (zaitcev@kotori.zaitcev.us)
Alex Yang (alex890714@gmail.com)

1
swift/obj/server.py
View File

@ -230,7 +230,6 @@ class DiskFile(object):
if verify_file: if verify_file:
self._handle_close_quarantine() self._handle_close_quarantine()
except (Exception, Timeout), e: except (Exception, Timeout), e:
import traceback
self.logger.error(_('ERROR DiskFile %(data_file)s in ' self.logger.error(_('ERROR DiskFile %(data_file)s in '
'%(data_dir)s close failure: %(exc)s : %(stack)'), '%(data_dir)s close failure: %(exc)s : %(stack)'),
{'exc': e, 'stack': ''.join(traceback.format_stack()), {'exc': e, 'stack': ''.join(traceback.format_stack()),