From b78da36220c2005ffab55703f961ab1d644c6b1b Mon Sep 17 00:00:00 2001 From: Davlet Panech Date: Mon, 27 Sep 2010 11:18:20 -0400 Subject: [PATCH] use os.path.join for constructing file names --- pgloader.py | 2 +- pgloader/logger.py | 4 +++- pgloader/options.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pgloader.py b/pgloader.py index ef640d0..9c62b0c 100755 --- a/pgloader.py +++ b/pgloader.py @@ -56,7 +56,7 @@ def parse_options(): help = "loglevel to use: ERROR, WARNING, INFO, DEBUG") parser.add_option("-L", "--logfile", dest = "logfile", - default = "%s/pgloader.log" % gettempdir(), + default = os.path.join (gettempdir(), "pgloader.log"), help = "log file, defauts to $TMPDIR/pgloader.log") parser.add_option("-r", "--reject-log", dest = "reject_log", diff --git a/pgloader/logger.py b/pgloader/logger.py index c5ccfd1..af4dec0 100644 --- a/pgloader/logger.py +++ b/pgloader/logger.py @@ -8,9 +8,11 @@ from tools import PGLoader_Error import logging from tempfile import gettempdir +import os def init(client_min_messages = logging.INFO, - log_min_messages = logging.DEBUG, filename = '%s/pgloader.log' % gettempdir()): + log_min_messages = logging.DEBUG, + filename = os.path.join (gettempdir(), 'pgloader.log')): """ set the console logging """ fmt = '%(asctime)s %(name)-12s %(levelname)-8s %(message)s' diff --git a/pgloader/options.py b/pgloader/options.py index 70a4998..0660ef0 100644 --- a/pgloader/options.py +++ b/pgloader/options.py @@ -3,6 +3,7 @@ # Some common options, for each module to get them from tempfile import gettempdir +import os PGLOADER_VERSION = '2.3.3~dev2' @@ -50,7 +51,7 @@ RRQUEUE_SIZE = None CLIENT_MIN_MESSAGES = None LOG_MIN_MESSAGES = DEBUG -DEFAULT_LOG_FILE = "%s/pgloader.log" % gettempdir() +DEFAULT_LOG_FILE = os.path.join (gettempdir(), "pgloader.log") LOG_FILE = None REJECT_LOG_FILE = '%s.rej.log'