Merging in latest boto.

boto/sdb/domain.py

 # Copyright (c) 2006,2007 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 258 matching lines @@
         """Load this domain based on an XML document"""
         import xml.sax
         handler = DomainDumpParser(self)
         xml.sax.parse(doc, handler)
         return handler
 
     def delete(self):
         """
         Delete this domain, and all items under it
         """
-        return self.connection.delete(self)
+        return self.connection.delete_domain(self)
 
 
 class DomainMetaData:
 
     def __init__(self, domain=None):
         self.domain = domain
         self.item_count = None
         self.item_names_size = None
         self.attr_name_count = None
         self.attr_names_size = None
@@ skipping 78 matching lines @@
 
     def run(self):
         try:
             self.db.batch_put_attributes(self.items)
         except:
             print "Exception using batch put, trying regular put instead"
             for item_name in self.items:
                 self.db.put_attributes(item_name, self.items[item_name])
         print ".",
         sys.stdout.flush()