merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -20,6 +20,8 @@ Fixed:
 - consistent text searching behaviour (AND everywhere) (sf bug 1101036)
 - fix handling of invalid date input (sf bug 1102165)
 - retain Boolean selections in edit error handling (sf bug 1101492)
+- fix initialisation of logging module from config file (sf bug 1108577)
+- removed rlog module (py 2.3 is minimum version now)
 
 
 2005-01-13 0.8.0b2

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: back_anydbm.py,v 1.179.2.4 2005-02-13 22:40:53 richard Exp $
+#$Id: back_anydbm.py,v 1.179.2.5 2005-02-14 02:55:30 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -33,7 +33,7 @@
 except AssertionError:
     print "WARNING: you should upgrade to python 2.1.3"
 
-import whichdb, os, marshal, re, weakref, string, copy, time, shutil
+import whichdb, os, marshal, re, weakref, string, copy, time, shutil, logging
 
 from roundup import hyperdb, date, password, roundupdb, security
 from roundup.backends import locking
@@ -177,7 +177,7 @@ def getclass(self, classname):
     def clear(self):
         '''Delete all database contents
         '''
-        self.config.logging.getLogger('hyperdb').info('clear')
+        logging.getLogger('hyperdb').info('clear')
         for cn in self.classes.keys():
             for dummy in 'nodes', 'journals':
                 path = os.path.join(self.dir, 'journals.%s'%cn)
@@ -223,7 +223,7 @@ def opendb(self, name, mode):
         # new database? let anydbm pick the best dbm
         if not db_type:
             if __debug__:
-                self.config.logging.getLogger('hyperdb').debug("opendb anydbm.open(%r, 'c')"%path)
+                logging.getLogger('hyperdb').debug("opendb anydbm.open(%r, 'c')"%path)
             return anydbm.open(path, 'c')
 
         # open the database with the correct module
@@ -234,7 +234,7 @@ def opendb(self, name, mode):
                 "Couldn't open database - the required module '%s'"\
                 " is not available"%db_type
         if __debug__:
-            self.config.logging.getLogger('hyperdb').debug("opendb %r.open(%r, %r)"%(db_type, path,
+            logging.getLogger('hyperdb').debug("opendb %r.open(%r, %r)"%(db_type, path,
                 mode))
         return dbm.open(path, mode)
 
@@ -295,7 +295,7 @@ def savenode(self, classname, nodeid, node):
         ''' perform the saving of data specified by the set/addnode
         '''
         if __debug__:
-            self.config.logging.getLogger('hyperdb').debug('save %s%s %r'%(classname, nodeid, node))
+            logging.getLogger('hyperdb').debug('save %s%s %r'%(classname, nodeid, node))
         self.transactions.append((self.doSaveNode, (classname, nodeid, node)))
 
     def getnode(self, classname, nodeid, db=None, cache=1):
@@ -308,14 +308,14 @@ def getnode(self, classname, nodeid, db=None, cache=1):
         cache_dict = self.cache.setdefault(classname, {})
         if cache_dict.has_key(nodeid):
             if __debug__:
-                self.config.logging.getLogger('hyperdb').debug('get %s%s cached'%(classname, nodeid))
+                logging.getLogger('hyperdb').debug('get %s%s cached'%(classname, nodeid))
                 self.stats['cache_hits'] += 1
             return cache_dict[nodeid]
 
         if __debug__:
             self.stats['cache_misses'] += 1
             start_t = time.time()
-            self.config.logging.getLogger('hyperdb').debug('get %s%s'%(classname, nodeid))
+            logging.getLogger('hyperdb').debug('get %s%s'%(classname, nodeid))
 
         # get from the database and save in the cache
         if db is None:
@@ -347,7 +347,7 @@ def destroynode(self, classname, nodeid):
         '''Remove a node from the database. Called exclusively by the
            destroy() method on Class.
         '''
-        self.config.logging.getLogger('hyperdb').info('destroy %s%s'%(classname, nodeid))
+        logging.getLogger('hyperdb').info('destroy %s%s'%(classname, nodeid))
 
         # remove from cache and newnodes if it's there
         if (self.cache.has_key(classname) and
@@ -473,7 +473,7 @@ def addjournal(self, classname, nodeid, action, params, creator=None,
             the current user.
         '''
         if __debug__:
-            self.config.logging.getLogger('hyperdb').debug('addjournal %s%s %s %r %s %r'%(classname,
+            logging.getLogger('hyperdb').debug('addjournal %s%s %s %r %s %r'%(classname,
                 nodeid, action, params, creator, creation))
         if creator is None:
             creator = self.getuid()
@@ -483,7 +483,7 @@ def addjournal(self, classname, nodeid, action, params, creator=None,
     def setjournal(self, classname, nodeid, journal):
         '''Set the journal to the "journal" list.'''
         if __debug__:
-            self.config.logging.getLogger('hyperdb').debug('setjournal %s%s %r'%(classname,
+            logging.getLogger('hyperdb').debug('setjournal %s%s %r'%(classname,
                 nodeid, journal))
         self.transactions.append((self.doSetJournal, (classname, nodeid,
             journal)))
@@ -570,7 +570,7 @@ def pack(self, pack_before):
                         packed += 1
                 db[key] = marshal.dumps(l)
 
-                self.config.logging.getLogger('hyperdb').info('packed %d %s items'%(packed,
+                logging.getLogger('hyperdb').info('packed %d %s items'%(packed,
                     classname))
 
             if db_type == 'gdbm':
@@ -584,7 +584,7 @@ def pack(self, pack_before):
     def commit(self):
         ''' Commit the current transactions.
         '''
-        self.config.logging.getLogger('hyperdb').info('commit %s transactions'%(
+        logging.getLogger('hyperdb').info('commit %s transactions'%(
             len(self.transactions)))
 
         # keep a handle to all the database files opened
@@ -705,7 +705,7 @@ def doDestroyNode(self, classname, nodeid):
     def rollback(self):
         ''' Reverse all actions from the current transaction.
         '''
-        self.config.logging.getLogger('hyperdb').info('rollback %s transactions'%(
+        logging.getLogger('hyperdb').info('rollback %s transactions'%(
             len(self.transactions)))
 
         for method, args in self.transactions:

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.88.2.2 2005-02-14 01:26:14 richard Exp $
+# $Id: back_metakit.py,v 1.88.2.3 2005-02-14 02:55:31 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -42,6 +42,7 @@
 BACKWARDS_COMPATIBLE = 1
 
 from roundup import hyperdb, date, password, roundupdb, security
+import logging
 import metakit
 from sessions_dbm import Sessions, OneTimeKeys
 import re, marshal, os, sys, time, calendar, shutil
@@ -259,7 +260,7 @@ def getjournal(self, tablenm, nodeid):
             try:
                 params = marshal.loads(row.params)
             except ValueError:
-                self.config.logging.getLogger("hyperdb").error(
+                logging.getLogger("hyperdb").error(
                     "history couldn't unmarshal %r" % row.params)
                 params = {}
             #usernm = userclass.get(str(row.user), 'username')
@@ -1374,14 +1375,14 @@ def ff(row, r=regexes):
                 try:
                     prop = getattr(v, propname)
                 except AttributeError:
-                    self.config.logging.getLogger("hyperdb").error(
+                    logging.getLogger("hyperdb").error(
                         "MK has no property %s" % propname)
                     continue
                 propclass = self.ruprops.get(propname, None)
                 if propclass is None:
                     propclass = self.privateprops.get(propname, None)
                     if propclass is None:
-                        self.config.logging.getLogger("hyperdb").error(
+                        logging.getLogger("hyperdb").error(
                             "Schema has no property %s" % propname)
                         continue
                 if isinstance(propclass, hyperdb.Link):

roundup/backends/back_mysql.py

@@ -38,6 +38,7 @@
 import MySQLdb
 import os, shutil
 from MySQLdb.constants import ER
+import logging
 
 def connection_dict(config, dbnamestr=None):
     d = rdbms_common.connection_dict(config, dbnamestr)
@@ -66,10 +67,10 @@ def db_nuke(config):
             for table in tables:
                 command = 'DROP TABLE %s'%table[0]
                 if __debug__:
-                    config.logging.getLogger('hyperdb').debug(command)
+                    logging.getLogger('hyperdb').debug(command)
                 cursor.execute(command)
             command = "DROP DATABASE %s"%config.RDBMS_NAME
-            config.logging.getLogger('hyperdb').info(command)
+            logging.getLogger('hyperdb').info(command)
             cursor.execute(command)
             conn.commit()
         conn.close()
@@ -83,7 +84,7 @@ def db_create(config):
     conn = MySQLdb.connect(**kwargs)
     cursor = conn.cursor()
     command = "CREATE DATABASE %s"%config.RDBMS_NAME
-    config.logging.getLogger('hyperdb').info(command)
+    logging.getLogger('hyperdb').info(command)
     cursor.execute(command)
     conn.commit()
     conn.close()
@@ -138,8 +139,7 @@ class Database(Database):
 
     def sql_open_connection(self):
         kwargs = connection_dict(self.config, 'db')
-        self.config.logging.getLogger('hyperdb').info('open database %r'%(
-            kwargs['db'],))
+        logging.getLogger('hyperdb').info('open database %r'%(kwargs['db'],))
         try:
             conn = MySQLdb.connect(**kwargs)
         except MySQLdb.OperationalError, message:
@@ -474,7 +474,7 @@ def create_class(self, spec):
     def sql_commit(self):
         ''' Actually commit to the database.
         '''
-        self.config.logging.getLogger('hyperdb').info('commit')
+        logging.getLogger('hyperdb').info('commit')
         self.conn.commit()
 
         # open a new cursor for subsequent work

roundup/backends/back_postgresql.py

@@ -10,6 +10,7 @@
 
 import os, shutil, popen2, time
 import psycopg
+import logging
 
 from roundup import hyperdb, date
 from roundup.backends import rdbms_common
@@ -26,13 +27,13 @@ def connection_dict(config, dbnamestr=None):
 def db_create(config):
     """Clear all database contents and drop database itself"""
     command = 'CREATE DATABASE %s'%config.RDBMS_NAME
-    config.logging.getLogger('hyperdb').info(command)
+    logging.getLogger('hyperdb').info(command)
     db_command(config, command)
 
 def db_nuke(config, fail_ok=0):
     """Clear all database contents and drop database itself"""
     command = 'DROP DATABASE %s'% config.RDBMS_NAME
-    config.logging.getLogger('hyperdb').info(command)
+    logging.getLogger('hyperdb').info(command)
     db_command(config, command)
 
     if os.path.exists(config.DATABASE):
@@ -95,8 +96,7 @@ class Database(rdbms_common.Database):
 
     def sql_open_connection(self):
         db = connection_dict(self.config, 'database')
-        self.config.logging.getLogger('hyperdb').info('open database %r'%(
-            db['database'],))
+        logging.getLogger('hyperdb').info('open database %r'%db['database'])
         try:
             conn = psycopg.connect(**db)
         except psycopg.OperationalError, message:

roundup/backends/back_sqlite.py

@@ -1,4 +1,4 @@
-# $Id: back_sqlite.py,v 1.36.2.2 2005-01-04 01:33:03 richard Exp $
+# $Id: back_sqlite.py,v 1.36.2.3 2005-02-14 02:55:31 richard Exp $
 '''Implements a backend for SQLite.
 
 See https://pysqlite.sourceforge.net/ for pysqlite info
@@ -9,7 +9,7 @@
 '''
 __docformat__ = 'restructuredtext'
 
-import os, base64, marshal, shutil, time
+import os, base64, marshal, shutil, time, logging
 
 from roundup import hyperdb, date, password
 from roundup.backends import locking
@@ -85,7 +85,7 @@ def sql_open_connection(self):
             os.makedirs(self.config.DATABASE)
 
         db = os.path.join(self.config.DATABASE, 'db')
-        self.config.logging.getLogger('hyperdb').info('open database %r'%db)
+        logging.getLogger('hyperdb').info('open database %r'%db)
         conn = sqlite.connect(db=db)
         # set a 30 second timeout (extraordinarily generous) for handling
         # locked database
@@ -159,7 +159,7 @@ def update_class(self, spec, old_spec, force=0, adding_v2=0):
             # no changes
             return 0
 
-        self.config.logging.getLogger('hyperdb').info('update_class %s'%spec.classname)
+        logging.getLogger('hyperdb').info('update_class %s'%spec.classname)
 
         # detect multilinks that have been removed, and drop their table
         old_has = {}