From 29a0ad85c76b8a5fb32613bbf41bf7ac2f0b3a67 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Sat, 15 Aug 2009 22:36:14 +0100
Subject: [PATCH] full path to logging.config, small fix in
 Configuration.Database string repr

---
 pyfpdb/Configuration.py        | 4 ++--
 pyfpdb/Database.py             | 2 +-
 pyfpdb/HandHistoryConverter.py | 2 +-
 pyfpdb/fpdb_import.py          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 8da4c0f1..43af4ab6 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -34,7 +34,7 @@ import xml.dom.minidom
 from xml.dom.minidom import Node
 
 import logging, logging.config
-logging.config.fileConfig("logging.conf")
+logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf"))
 log = logging.getLogger("config")
 log.debug("config logger initialised")
 
@@ -208,7 +208,7 @@ class Database:
             if key.startswith('__'): continue
             value = getattr(self, key)
             if callable(value): continue
-            temp = temp + '    ' + key + " = " + value + "\n"
+            temp = temp + '    ' + key + " = " + repr(value) + "\n"
         return temp
 
 class Aux_window:
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 31a242ba..a097fdca 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -44,7 +44,7 @@ import Card
 from Exceptions import *
 
 import logging, logging.config
-logging.config.fileConfig("logging.conf")
+logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf"))
 log = logging.getLogger('db')
 
 class Database:
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 29014e10..5b7d062e 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -36,7 +36,7 @@ import gettext
 gettext.install('fpdb')
 
 import logging, logging.config
-logging.config.fileConfig("logging.conf")
+logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf"))
 log = logging.getLogger("parser")
 
 class HandHistoryConverter():
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index f90a47b5..ac0153f6 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -39,7 +39,7 @@ import fpdb_parse_logic
 import Configuration
 
 import logging, logging.config
-logging.config.fileConfig("logging.conf")
+logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf"))
 log = logging.getLogger('importer')
 
 #    database interface modules