Fixing Python 3.x issues.

@@ -118,7 +118,7 @@ class Stack(object):
                 StackName=self.name, TemplateBody=template_body,
                 StackName=self.name, TemplateBody=template_body,
                 Capabilities=['CAPABILITY_IAM'])
                 Capabilities=['CAPABILITY_IAM'])
             LOG.debug(response)
             LOG.debug(response)
-        except Exception, e:
+        except Exception as e:
             if 'ValidationError' in str(e):
             if 'ValidationError' in str(e):
                 LOG.info('No Updates Required')
                 LOG.info('No Updates Required')
             else:
             else:

@@ -16,7 +16,7 @@ import unittest
 import mock
 import mock
 
 
 from kappa.log import Log
 from kappa.log import Log
-from mock_aws import get_aws
+from tests.unit.mock_aws import get_aws
 
 
 
 
 class TestLog(unittest.TestCase):
 class TestLog(unittest.TestCase):

@@ -17,7 +17,7 @@ import os
 import mock
 import mock
 
 
 from kappa.stack import Stack
 from kappa.stack import Stack
-from mock_aws import get_aws
+from tests.unit.mock_aws import get_aws
 
 
 Config = {
 Config = {
     'template': 'roles.cf',
     'template': 'roles.cf',