openstack/cinder
Code Issues Proposed changes

Use Python 3.x compatible except construct

Browse Source 
Use except x as y:, which works with any
Python version >= 2.6

Change-Id: Ibf0f9aa8fb9725c1c9c00558ec217db96301678f
This commit is contained in:
Dirk Mueller 2013-06-18 21:09:19 +02:00
parent 317220858e
commit 646096aa11
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/scheduler/scheduler_options.py
View File

@ -76,7 +76,7 @@ class SchedulerOptions(object):
"""Decode the JSON file. Broken out for testing.""" """Decode the JSON file. Broken out for testing."""
try: try:
return json.load(handle) return json.load(handle)
except ValueError, e: except ValueError as e:
LOG.exception(_("Could not decode scheduler options: '%s'") % e) LOG.exception(_("Could not decode scheduler options: '%s'") % e)
return {} return {}