NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert logging line termination feature

Browse Source
This commit is contained in:
Ozzie Isaacs 2024-02-26 18:07:24 +01:00
parent 23a8a4657d
commit abbd9a5888
3 changed files with 663 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cps/logger.py
View File

@ -61,19 +61,6 @@ class _Logger(logging.Logger):
else: else:
self.debug(message, *args, **kwargs) self.debug(message, *args, **kwargs)
def warning(self, message, *args, **kwargs):
message = message.replace("\r", "").replace("\n", "")
list_args = list(args)
for index, arg in enumerate(list_args):
list_args[index] = arg.replace("\r", "").replace("\n", "")
args = tuple(list_args)
super().warning(message, *args, **kwargs)
def debug(self, message, *args, **kwargs):
message = message.replace("\r", "").replace("\n", "")
super().debug(message, *args, **kwargs)
def get(name=None): def get(name=None):
return logging.getLogger(name) return logging.getLogger(name)

26
setup.cfg
View File

@ -42,18 +42,18 @@ install_requires =
APScheduler>=3.6.3,<3.11.0 APScheduler>=3.6.3,<3.11.0
Babel>=1.3,<3.0 Babel>=1.3,<3.0
Flask-Babel>=0.11.1,<4.1.0 Flask-Babel>=0.11.1,<4.1.0
Flask-Login>=0.3.2,<0.6.3 Flask-Login>=0.3.2,<0.6.4
Flask-Principal>=0.3.2,<0.5.1 Flask-Principal>=0.3.2,<0.5.1
Flask>=1.0.2,<2.4.0 Flask>=1.0.2,<3.1.0
iso-639>=0.4.5,<0.5.0 iso-639>=0.4.5,<0.5.0
PyPDF>=3.0.0,<3.16.0 PyPDF>=3.15.6,<4.1.0
pytz>=2016.10 pytz>=2016.10
requests>=2.28.0,<2.32.0 requests>=2.28.0,<2.32.0
SQLAlchemy>=1.3.0,<2.1.0 SQLAlchemy>=1.3.0,<2.1.0
tornado>=6.3,<6.4 tornado>=6.3,<6.5
Wand>=0.4.4,<0.7.0 Wand>=0.4.4,<0.7.0
unidecode>=0.04.19,<1.4.0 unidecode>=0.04.19,<1.4.0
lxml>=3.8.0,<5.0.0 lxml>=3.8.0,<5.2.0
flask-wtf>=0.14.2,<1.3.0 flask-wtf>=0.14.2,<1.3.0
chardet>=3.0.0,<4.1.0 chardet>=3.0.0,<4.1.0
advocate>=1.0.0,<1.1.0 advocate>=1.0.0,<1.1.0
@ -66,23 +66,23 @@ include = cps/services*
[options.extras_require] [options.extras_require]
gdrive = gdrive =
google-api-python-client>=1.7.11,<2.108.0 google-api-python-client>=1.7.11,<2.120.0
gevent>20.6.0,<24.0.0 gevent>20.6.0,<24.3.0
greenlet>=0.4.17,<3.1.0 greenlet>=0.4.17,<3.1.0
httplib2>=0.9.2,<0.23.0 httplib2>=0.9.2,<0.23.0
oauth2client>=4.0.0,<4.1.4 oauth2client>=4.0.0,<4.1.4
uritemplate>=3.0.0,<4.2.0 uritemplate>=3.0.0,<4.2.0
pyasn1-modules>=0.0.8,<0.4.0 pyasn1-modules>=0.0.8,<0.4.0
pyasn1>=0.1.9,<0.6.0 pyasn1>=0.1.9,<0.6.0
PyDrive2>=1.3.1,<1.18.0 PyDrive2>=1.3.1,<1.20.0
PyYAML>=3.12,<6.1 PyYAML>=3.12,<6.1
rsa>=3.4.2,<4.10.0 rsa>=3.4.2,<4.10.0
gmail = gmail =
google-auth-oauthlib>=0.4.3,<1.1.0 google-auth-oauthlib>=0.4.3,<1.3.0
google-api-python-client>=1.7.11,<2.108.0 google-api-python-client>=1.7.11,<2.120.0
goodreads = goodreads =
goodreads>=0.3.2,<0.4.0 goodreads>=0.3.2,<0.4.0
python-Levenshtein>=0.12.0,<0.22.0 python-Levenshtein>=0.12.0,<0.26.0
ldap = ldap =
python-ldap>=3.0.0,<3.5.0 python-ldap>=3.0.0,<3.5.0
Flask-SimpleLDAP>=1.4.0,<1.5.0 Flask-SimpleLDAP>=1.4.0,<1.5.0
@ -90,10 +90,10 @@ oauth =
Flask-Dance>=2.0.0,<7.1.0 Flask-Dance>=2.0.0,<7.1.0
SQLAlchemy-Utils>=0.33.5,<0.42.0 SQLAlchemy-Utils>=0.33.5,<0.42.0
metadata = metadata =
rarfile>=3.2 rarfile>=3.2,<4.2
scholarly>=1.2.0,<1.8 scholarly>=1.2.0,<1.8
markdown2>=2.0.0,<2.5.0 markdown2>=2.0.0,<2.5.0
html2text>=2020.1.16,<2022.1.1 html2text>=2020.1.16,<2024.2.26
python-dateutil>=2.1,<2.9.0 python-dateutil>=2.1,<2.9.0
beautifulsoup4>=4.0.1,<4.13.0 beautifulsoup4>=4.0.1,<4.13.0
faust-cchardet>=2.1.18,<2.1.20 faust-cchardet>=2.1.18,<2.1.20

746
test/Calibre-Web TestSummary_Linux.html
View File

File diff suppressed because it is too large Load Diff