From bb840d46cf5db35f6cadbdc9e2ff47fd02616b66 Mon Sep 17 00:00:00 2001 From: agp8x Date: Sun, 30 Aug 2015 17:17:00 +0200 Subject: [PATCH] renamed settings module to config to avoid irritations --- Logger.py | 4 ++-- Setup.py | 4 ++-- settings.py => config.py | 0 main.py | 2 +- move.py | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) rename settings.py => config.py (100%) diff --git a/Logger.py b/Logger.py index 80b42d7..4cfb765 100644 --- a/Logger.py +++ b/Logger.py @@ -8,8 +8,8 @@ import xml.etree.ElementTree as ET import os from timeFunctions import * -from settings import SensorType, setup_data_echo, setup_data_log -from settings import settings +from config import SensorType, setup_data_echo, setup_data_log +from config import settings class Logger(object): def __init__(self, log): diff --git a/Setup.py b/Setup.py index 3ef4a52..7208727 100644 --- a/Setup.py +++ b/Setup.py @@ -15,8 +15,8 @@ except ImportError: print("package 'tinkerforge' not installed, canceling") raise Exception("package 'tinkerforge' not installed, canceling") -from settings import SensorType -from settings import settings +from config import SensorType +from config import settings class ConnectionSetup(object): def __init__(self, log): diff --git a/settings.py b/config.py similarity index 100% rename from settings.py rename to config.py diff --git a/main.py b/main.py index dcbde80..6c2ad4c 100644 --- a/main.py +++ b/main.py @@ -6,7 +6,7 @@ import time from Logger import Logger from Setup import ConnectionSetup -from settings import settings, setupLogger +from config import settings, setupLogger log = setupLogger() lockpath=os.path.join(settings.locks,settings.lockname) diff --git a/move.py b/move.py index 9860230..ef2e3db 100644 --- a/move.py +++ b/move.py @@ -7,8 +7,7 @@ import logging from shutil import move from timeFunctions import * -from settings import settings -#from settings import locks, logs, arch, records, movelog, movelock +from config import settings def setupLogger(): log = logging.getLogger("weatherstation.move")