Merging in latest boto.

boto/sdb/db/manager/pgmanager.py

 # Copyright (c) 2006,2007,2008 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
@@ skipping 343 matching lines @@
             return self._object_from_row(row, self.cursor.description)
         else:
             raise SDBPersistenceError('%s object with id=%s does not exist' % (cls.__name__, id))
         
     def get_object_from_id(self, id):
         return self.get_object(self.cls, id)
 
     def _find_calculated_props(self, obj):
         return [p for p in obj.properties() if hasattr(p, 'calculated_type')]
 
-    def save_object(self, obj):
+    def save_object(self, obj, expected_value=None):
         obj._auto_update = False
         calculated = self._find_calculated_props(obj)
         if not obj.id:
             obj.id = str(uuid.uuid4())
             qs, values = self._build_insert_qs(obj, calculated)
         else:
             qs, values = self._build_update_qs(obj, calculated)
         print qs
         self.cursor.execute(qs, values)
         if calculated:
             calc_values = self.cursor.fetchone()
             print calculated
             print calc_values
             for i in range(0, len(calculated)):
                 prop = calculated[i]
                 prop._set_direct(obj, calc_values[i])
         self.commit()
 
     def delete_object(self, obj):
         qs = """DELETE FROM "%s" WHERE id='%s';""" % (self.db_table, obj.id)
         print qs
         self.cursor.execute(qs)
         self.commit()