Merge "Use Python 3.x compatible except construct"

cinder/scheduler/scheduler_options.py

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