add Python 3 compatibility #12

Author: osiegmar

cloudwatchmon/cli/get_instance_stats.py

@@ -71,7 +71,7 @@ def print_metric_stats(region, instance_id, namespace, metric, title,
     start_time = end_time - datetime.timedelta(hours=recent_hours)
     dims = {'InstanceId': instance_id}
     if xdims:
-        dims = dict(dims.items() + xdims.items())
+        dims.update(xdims)
     metrics = conn.get_metric_statistics(300, start_time, end_time,
                                          metric, namespace,
                                          ['Average', 'Maximum', 'Minimum'],

cloudwatchmon/cli/put_instance_stats.py

@@ -170,7 +170,9 @@ def __add_metric_dimensions(self, name, unit, value, common_dims, dims):
             self.names.append(name)
             self.units.append(unit)
             self.values.append(value)
-            self.dimensions.append(dict(common_dims.items() + dim.items()))
+            metric_dims = common_dims.copy()
+            metric_dims.update(dim)
+            self.dimensions.append(metric_dims)
 
     def send(self, verbose):
         boto_debug = 2 if verbose else 0

setup.py

@@ -30,7 +30,13 @@ def readme():
           ]
       },
       classifiers=[
-          'Programming Language :: Python :: 2 :: Only',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.6',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.3',
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
           'License :: OSI Approved :: Apache Software License',
           'Topic :: System :: Monitoring'
       ]