Merging in latest boto.

boto/sdb/db/manager/__init__.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 48 matching lines @@
     if boto.config.has_section(db_section):
         db_user = boto.config.get(db_section, 'db_user', db_user)
         db_passwd = boto.config.get(db_section, 'db_passwd', db_passwd)
         db_type = boto.config.get(db_section, 'db_type', db_type)
         db_name = boto.config.get(db_section, 'db_name', db_name)
         db_table = boto.config.get(db_section, 'db_table', db_table)
         db_host = boto.config.get(db_section, 'db_host', db_host)
         db_port = boto.config.getint(db_section, 'db_port', db_port)
         enable_ssl = boto.config.getint(db_section, 'enable_ssl', enable_ssl)
         debug = boto.config.getint(db_section, 'debug', debug)
+    elif hasattr(cls, "_db_name") and cls._db_name is not None:
+        # More specific then the generic DB config is any _db_name class property
+        db_name = cls._db_name
     elif hasattr(cls.__bases__[0], "_manager"):
         return cls.__bases__[0]._manager
     if db_type == 'SimpleDB':
         from sdbmanager import SDBManager
         return SDBManager(cls, db_name, db_user, db_passwd,
                           db_host, db_port, db_table, sql_dir, enable_ssl)
     elif db_type == 'PostgreSQL':
         from pgmanager import PGManager
         if db_table:
             return PGManager(cls, db_name, db_user, db_passwd,
                              db_host, db_port, db_table, sql_dir, enable_ssl)
         else:
             return None
     elif db_type == 'XML':
         from xmlmanager import XMLManager
         return XMLManager(cls, db_name, db_user, db_passwd,
                           db_host, db_port, db_table, sql_dir, enable_ssl)
     else:
         raise ValueError, 'Unknown db_type: %s' % db_type