Browse Source

Merge branch 'release-1.0' back into develop

develop
Jonathan Golder 6 years ago
parent
commit
562e689418
  1. 4
      README.md
  2. 2
      bots/markpages.py
  3. 2
      bots/reddiscparser.py
  4. 2
      jogobot
  5. 7
      lib/mysqlred.py
  6. 2
      lib/redfam.py
  7. 2
      lib/redpage.py
  8. 2
      red.py

4
README.md

@ -18,6 +18,10 @@ Those can be installed using pip and the _requirements.txt_ file provided with t
Versions
--------
* v1.0
- first stable release
- less debug output
- fixed problems with article title
* test-v7
- Fixed problem with url encoded chars in article title

2
bots/markpages.py

@ -3,7 +3,7 @@
#
# markpages.py
#
# Copyright 2016 GOLDERWEB – Jonathan Golder <jonathan@golderweb.de>
# Copyright 2017 Jonathan Golder <jonathan@golderweb.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
bots/reddiscparser.py

@ -3,7 +3,7 @@
#
# reddiscparser.py
#
# Copyright 2016 GOLDERWEB – Jonathan Golder <jonathan@golderweb.de>
# Copyright 2017 Jonathan Golder <jonathan@golderweb.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
jogobot

@ -1 +1 @@
Subproject commit 49ada2993e345600523c161c5e2516ec65625684
Subproject commit d69d873624abb70a25a0aef711a635cfc88aa7e9

7
lib/mysqlred.py

@ -3,7 +3,7 @@
#
# mysqlred.py
#
# Copyright 2015 GOLDERWEB – Jonathan Golder <jonathan@golderweb.de>
# Copyright 2017 Jonathan Golder <jonathan@golderweb.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -51,10 +51,11 @@ url = URL( "mysql+pymysql",
password=config.db_password,
host=config.db_hostname,
port=config.db_port,
database=config.db_username + jogobot.config['db_suffix'],
database=( config.db_username +
jogobot.config['redundances']['db_suffix'] ),
query={'charset': 'utf8'} )
engine = create_engine(url, echo=True)
engine = create_engine(url, echo=False)
Session = sessionmaker(bind=engine)

2
lib/redfam.py

@ -3,7 +3,7 @@
#
# redfam.py
#
# Copyright 2017 GOLDERWEB – Jonathan Golder <jonathan@golderweb.de>
# Copyright 2017 Jonathan Golder <jonathan@golderweb.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
lib/redpage.py

@ -3,7 +3,7 @@
#
# redpage.py
#
# Copyright 2015 GOLDERWEB – Jonathan Golder <jonathan@golderweb.de>
# Copyright 2017 Jonathan Golder <jonathan@golderweb.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
red.py

@ -3,7 +3,7 @@
#
# reddiscparser.py
#
# Copyright 2016 GOLDERWEB – Jonathan Golder <jonathan@golderweb.de>
# Copyright 2017 Jonathan Golder <jonathan@golderweb.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

Loading…
Cancel
Save