--- backends/back_mysql.py~ 2005-01-04 13:14:23.044365472 -0500 +++ backends/back_mysql.py 2005-01-04 15:00:08.272191536 -0500 @@ -43,8 +43,7 @@ def db_nuke(config): """Clear all database contents and drop database itself""" if db_exists(config): - conn = MySQLdb.connect(config.MYSQL_DBHOST, config.MYSQL_DBUSER, - config.MYSQL_DBPASSWORD) + conn = MySQLdb.connect(*config.MYSQL_DATABASE) try: conn.select_db(config.MYSQL_DBNAME) except: @@ -69,8 +68,7 @@ def db_create(config): """Create the database.""" - conn = MySQLdb.connect(config.MYSQL_DBHOST, config.MYSQL_DBUSER, - config.MYSQL_DBPASSWORD) + conn = MySQLdb.connect(*config.MYSQL_DATABASE) cursor = conn.cursor() if __debug__: print >>hyperdb.DEBUG, "CREATE DATABASE %s"%config.MYSQL_DBNAME @@ -80,8 +78,7 @@ def db_exists(config): """Check if database already exists.""" - conn = MySQLdb.connect(config.MYSQL_DBHOST, config.MYSQL_DBUSER, - config.MYSQL_DBPASSWORD) + conn = MySQLdb.connect(*config.MYSQL_DATABASE) # tables = None try: try: @@ -137,9 +134,9 @@ } def sql_open_connection(self): - db = getattr(self.config, 'MYSQL_DATABASE') + #db = getattr(self.config, 'MYSQL_DATABASE') try: - conn = MySQLdb.connect(*db) + conn = MySQLdb.connect(*self.config.MYSQL_DATABASE) except MySQLdb.OperationalError, message: raise DatabaseError, message cursor = conn.cursor()