python3 compat, sanitize

troposphere_sugar/__init__.py

@@ -1,3 +1,3 @@
-from .skel import Skel
-from .command import Command
-from decorators import *
+from troposphere_sugar.skel import Skel
+from troposphere_sugar.command import Command
+from troposphere_sugar.decorators import *

troposphere_sugar/command.py

@@ -1,7 +1,6 @@
-#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
-from skel import Skel
-from runner import Runner
+from troposphere_sugar.skel import Skel
+from troposphere_sugar.runner import Runner
 import argparse
 import re
 

troposphere_sugar/decorators/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 class cache(object):
     def __init__(self, func):

troposphere_sugar/runner.py

@@ -63,7 +63,7 @@ def create(self):
     def update(self):
         try:
             self.client.update_stack(**self.stack_operation_args())
-        except botocore.exceptions.ClientError, e:
+        except botocore.exceptions.ClientError as e:
             if "No updates are to be performed" not in str(e):
                 raise
 

troposphere_sugar/skel.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
-from decorators import *
+from troposphere_sugar.decorators import *
 from troposphere import Template
 from random import randint
 
@@ -16,7 +15,7 @@ def _defaults(self):
                 }
 
     def _get_all_decorated_for_class(self, clazz, ttype):
-        all = clazz.__dict__.values()
+        all = list(clazz.__dict__.values())
         for base_clazz in clazz.__bases__:
             all += self._get_all_decorated_for_class(base_clazz, ttype)
         return [prop for prop in all if isinstance(prop, ttype)]