Merge branch 'master' of github.com:boto/boto

vikalp · Apr 11, 2011 · ab2cda8 · ab2cda8
2 parents 39083e4 + 4d5a732
commit ab2cda8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/boto/ec2/autoscale/__init__.py b/boto/ec2/autoscale/__init__.py
@@ -226,8 +226,7 @@ def delete_launch_configuration(self, launch_config_name):
         longer available for use.
         """
         params = {'LaunchConfigurationName' : launch_config_name}
-        return self.connection.get_object('DeleteLaunchConfiguration', params,
-                                          Request)
+        return self.get_object('DeleteLaunchConfiguration', params, Request)
 
     def get_all_groups(self, names=None, max_records=None, next_token=None):
         """

diff --git a/boto/ec2/cloudwatch/__init__.py b/boto/ec2/cloudwatch/__init__.py
@@ -413,7 +413,7 @@ def put_metric_alarm(self, alarm):
                     'MetricName'            :       alarm.metric,
                     'Namespace'             :       alarm.namespace,
                     'Statistic'             :       alarm.statistic,
-                    'ComparisonOperator'    :       MetricAlarm._cmp_map[alarm.comparison],
+                    'ComparisonOperator'    :       alarm.comparison,
                     'Threshold'             :       alarm.threshold,
                     'EvaluationPeriods'     :       alarm.evaluation_periods,
                     'Period'                :       alarm.period,

diff --git a/boto/sdb/db/manager/sdbmanager.py b/boto/sdb/db/manager/sdbmanager.py
@@ -628,6 +628,13 @@ def save_object(self, obj, expected_value=None):
                         raise SDBPersistenceError("Error: %s must be unique!" % property.name)
                 except(StopIteration):
                     pass
+        # Convert the Expected value to SDB format
+        if expected_value:
+            prop = obj.find_property(expected_value[0])
+            v = expected_value[1]
+            if v is not None and not type(v) == bool:
+                v = self.encode_value(prop, v)
+            expected_value[1] = v
         self.domain.put_attributes(obj.id, attrs, replace=True, expected_value=expected_value)
         if len(del_attrs) > 0:
             self.domain.delete_attributes(obj.id, del_attrs)