Merge branch 'jogobot' into test-v3

Use new jogobot package
This commit is contained in:
2016-02-29 11:37:40 +01:00
4 changed files with 8 additions and 3 deletions

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "jogobot"]
path = jogobot
url = ../jogobot

1
jogobot Submodule

Submodule jogobot added at dac01a224b

View File

@@ -49,7 +49,7 @@ class MysqlRed:
db_hostname = config.db_hostname db_hostname = config.db_hostname
db_username = config.db_username db_username = config.db_username
db_password = config.db_password 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 # Class variables for storing cached querys
_cached_update_data = [] _cached_update_data = []

View File

@@ -121,13 +121,14 @@ class RedFamParser( RedFam ):
""" """
# Define the timestamp format # Define the timestamp format
__timestamp_format = jogobot.timestamp_format __timestamp_format = jogobot.config['redundances']['timestamp_format']
# Define section heading re.pattern # Define section heading re.pattern
__sectionhead_pat = re.compile( r"^(=+)(.*\[\[.+\]\].*\[\[.+\]\].*)\1" ) __sectionhead_pat = re.compile( r"^(=+)(.*\[\[.+\]\].*\[\[.+\]\].*)\1" )
# Define timestamp re.pattern # 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 # Textpattern for recognisation of done-notices
__done_notice = ":<small>Archivierung dieses Abschnittes \ __done_notice = ":<small>Archivierung dieses Abschnittes \