From f29dfd50039d74f605676f51054e2f8467fba370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?GOLDERWEB=20=E2=80=93=20Jonathan=20Golder?= Date: Sun, 28 Feb 2016 18:00:46 +0100 Subject: [PATCH 1/3] Use new jogobot module --- .gitmodules | 3 +++ jogobot | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 jogobot diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..07bf754 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "jogobot"] + path = jogobot + url = ../jogobot diff --git a/jogobot b/jogobot new file mode 160000 index 0000000..b0c844b --- /dev/null +++ b/jogobot @@ -0,0 +1 @@ +Subproject commit b0c844b2de2503eb77a172e57a288f947a978530 From b26f04db8c3bc460664dd93040d457b00ab8160d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?GOLDERWEB=20=E2=80=93=20Jonathan=20Golder?= Date: Mon, 29 Feb 2016 11:13:14 +0100 Subject: [PATCH 2/3] Use updated version of jogobot with ast.literal_eval parsed config entrys --- jogobot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jogobot b/jogobot index b0c844b..dac01a2 160000 --- a/jogobot +++ b/jogobot @@ -1 +1 @@ -Subproject commit b0c844b2de2503eb77a172e57a288f947a978530 +Subproject commit dac01a224b8b190ed8c5bf8c0183dc879e775f81 From 24adafeee7953b67339ed7b5e3df1fa4c7fdf783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?GOLDERWEB=20=E2=80=93=20Jonathan=20Golder?= Date: Mon, 29 Feb 2016 11:35:48 +0100 Subject: [PATCH 3/3] Changes for new jogobot-module --- mysqlred.py | 2 +- redfam.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mysqlred.py b/mysqlred.py index 83dd48c..c7e27ab 100644 --- a/mysqlred.py +++ b/mysqlred.py @@ -49,7 +49,7 @@ class MysqlRed: db_hostname = config.db_hostname db_username = config.db_username db_password = config.db_password - db_name = config.db_username + jogobot.db_namesuffix + db_name = config.db_username + jogobot.config['db_suffix'] # Class variables for storing cached querys _cached_update_data = [] diff --git a/redfam.py b/redfam.py index f056cc4..771d9f5 100644 --- a/redfam.py +++ b/redfam.py @@ -121,13 +121,14 @@ class RedFamParser( RedFam ): """ # Define the timestamp format - __timestamp_format = jogobot.timestamp_format + __timestamp_format = jogobot.config['redundances']['timestamp_format'] # Define section heading re.pattern __sectionhead_pat = re.compile( r"^(=+)(.*\[\[.+\]\].*\[\[.+\]\].*)\1" ) # Define timestamp re.pattern - __timestamp_pat = re.compile( jogobot.timestamp_regex ) + __timestamp_pat = re.compile( jogobot.config['redundances'] + ['timestamp_regex'] ) # Textpattern for recognisation of done-notices __done_notice = ":Archivierung dieses Abschnittes \