Engine exception handling error

[Steven Hardy]

As pointed out by Zane, there is a problem with one of the except clauses in service.py:

 # We're expecting EC2 credentials because all in-instance credentials
        # are deployed as ec2 keypairs
        try:
            ec2_creds = json.loads(cnxt.aws_creds).get('ec2Credentials')
        except TypeError, AttributeError:
            ec2_creds = None

The TypeError, AttributeError should be inside a tuple or this won't work as required, (ref PEP3110)

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/24347

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/24347
Committed: http://github.com/openstack/heat/commit/834b87a258a162ff8462de98b54a8036bf592d87
Submitter: Jenkins
Branch: master

commit 834b87a258a162ff8462de98b54a8036bf592d87
Author: Steven Hardy <email address hidden>
Date: Wed Mar 13 18:03:34 2013 +0000

    heat engine : fix exception syntax issue

    Fix exception clause to use a tuple or the two types of
    exception are not correctly caught.

    fixes bug 1154708

    Change-Id: Ia742c92dc189d03f8034ca864334526f1234dde3