From 848595f49b317f5504aa0d6525871947d6e654f5 Mon Sep 17 00:00:00 2001
From: dim <dim>
Date: Thu, 18 Sep 2008 12:58:12 +0000
Subject: [PATCH] Some more python2.3 support changes

---
 debian/changelog   | 2 ++
 pgloader.py        | 6 +++---
 pgloader/logger.py | 8 ++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e217f4a..d259c57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ pgloader (2.3.2-1) unstable; urgency=low
   * FIX fixedreader: it now know about -C
   * FIX Round Robin Reader with respect to offsets in readlines()
   * allow python 2.3 to run pgloader when it does not need collections.deque (no Round Robin Reader)
+  * change logger initialisation to support python 2.3
+  * FIX bad usage of STDERR in the code
 
  -- Dimitri Fontaine <dim@tapoueh.org>  Wed, 17 Sep 2008 17:53:53 +0200
 
diff --git a/pgloader.py b/pgloader.py
index cae58be..ed9653f 100644
--- a/pgloader.py
+++ b/pgloader.py
@@ -607,15 +607,15 @@ if __name__ == "__main__":
     try:
         ret = load_data()
     except Exception, e:
-        print >>STDERR, e
+        sys.stderr.write(str(e) + '\n')
         sys.exit(1)
 
     except IOError, e:
-        print >>STDERR, e
+        sys.stderr.write(str(e) + '\n')
         sys.exit(1)
 
     except KeyboardInterrupt, e:
-        print >>STDERR, e
+        sys.stderr.write(str(e) + '\n')
         sys.exit(1)
         
     sys.exit(ret)
diff --git a/pgloader/logger.py b/pgloader/logger.py
index 535e027..33250bd 100644
--- a/pgloader/logger.py
+++ b/pgloader/logger.py
@@ -20,6 +20,14 @@ def init(client_min_messages = logging.INFO,
                             datefmt  = '%d-%m-%Y %H:%M:%S',
                             filename = filename,
                             filemode = 'w')
+    except TypeError:
+        # very old python (2.3 or such) didn't have kwargs in basicConfig
+        logfile = logging.FileHandler(filename, filemode)
+        logfile.setLevel(log_min_messages)
+        logfile_fmt = logging.Formatter(fmt, datefmt)
+        logfile.setFormatter(logfile_fmt)
+        
+        logging.getLogger('').addHandler(logfile)
     except IOError, e:
         raise PGLoader_Error, e