renamed settings module to config to avoid irritations

master
agp8x 2015-08-30 17:17:00 +02:00
parent a237de8940
commit bb840d46cf
5 changed files with 6 additions and 7 deletions

View File

@ -8,8 +8,8 @@ import xml.etree.ElementTree as ET
import os import os
from timeFunctions import * from timeFunctions import *
from settings import SensorType, setup_data_echo, setup_data_log from config import SensorType, setup_data_echo, setup_data_log
from settings import settings from config import settings
class Logger(object): class Logger(object):
def __init__(self, log): def __init__(self, log):

View File

@ -15,8 +15,8 @@ except ImportError:
print("package 'tinkerforge' not installed, canceling") print("package 'tinkerforge' not installed, canceling")
raise Exception("package 'tinkerforge' not installed, canceling") raise Exception("package 'tinkerforge' not installed, canceling")
from settings import SensorType from config import SensorType
from settings import settings from config import settings
class ConnectionSetup(object): class ConnectionSetup(object):
def __init__(self, log): def __init__(self, log):

View File

@ -6,7 +6,7 @@ import time
from Logger import Logger from Logger import Logger
from Setup import ConnectionSetup from Setup import ConnectionSetup
from settings import settings, setupLogger from config import settings, setupLogger
log = setupLogger() log = setupLogger()
lockpath=os.path.join(settings.locks,settings.lockname) lockpath=os.path.join(settings.locks,settings.lockname)

View File

@ -7,8 +7,7 @@ import logging
from shutil import move from shutil import move
from timeFunctions import * from timeFunctions import *
from settings import settings from config import settings
#from settings import locks, logs, arch, records, movelog, movelock
def setupLogger(): def setupLogger():
log = logging.getLogger("weatherstation.move") log = logging.getLogger("weatherstation.move")