Merging in latest boto.

boto/sdb/db/manager/xmlmanager.py

 # Copyright (c) 2006-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 391 matching lines @@
         prop_node.appendChild(items_node)
         for item in items:
             item_node = doc.createElement('item')
             items_node.appendChild(item_node)
             if isinstance(item, Node):
                 item_node.appendChild(item)
             else:
                 text_node = doc.createTextNode(item)
                 item_node.appendChild(text_node)
 
-    def save_object(self, obj):
+    def save_object(self, obj, expected_value=None):
         """
         Marshal the object and do a PUT
         """
         doc = self.marshal_object(obj)
         if obj.id:
             url = "/%s/%s" % (self.db_name, obj.id)
         else:
             url = "/%s" % (self.db_name)
         resp = self._make_request("PUT", url, body=doc.toxml())
         new_obj = self.get_object_from_doc(obj.__class__, None, parse(resp))
@@ skipping 85 matching lines @@
 
     def get_property(self, prop, obj, name):
         pass
 
     def load_object(self, obj):
         if not obj._loaded:
             obj = obj.get_by_id(obj.id)
             obj._loaded = True
         return obj