diff --git a/cps/logger.py b/cps/logger.py index 5517dc0f..74f7fb39 100644 --- a/cps/logger.py +++ b/cps/logger.py @@ -61,19 +61,6 @@ class _Logger(logging.Logger): else: 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): return logging.getLogger(name) diff --git a/setup.cfg b/setup.cfg index 4c23a0ba..615a44da 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,18 +42,18 @@ install_requires = APScheduler>=3.6.3,<3.11.0 Babel>=1.3,<3.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>=1.0.2,<2.4.0 + Flask>=1.0.2,<3.1.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 requests>=2.28.0,<2.32.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 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 chardet>=3.0.0,<4.1.0 advocate>=1.0.0,<1.1.0 @@ -66,23 +66,23 @@ include = cps/services* [options.extras_require] gdrive = - google-api-python-client>=1.7.11,<2.108.0 - gevent>20.6.0,<24.0.0 + google-api-python-client>=1.7.11,<2.120.0 + gevent>20.6.0,<24.3.0 greenlet>=0.4.17,<3.1.0 httplib2>=0.9.2,<0.23.0 oauth2client>=4.0.0,<4.1.4 uritemplate>=3.0.0,<4.2.0 pyasn1-modules>=0.0.8,<0.4.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 rsa>=3.4.2,<4.10.0 gmail = - google-auth-oauthlib>=0.4.3,<1.1.0 - google-api-python-client>=1.7.11,<2.108.0 + google-auth-oauthlib>=0.4.3,<1.3.0 + google-api-python-client>=1.7.11,<2.120.0 goodreads = goodreads>=0.3.2,<0.4.0 - python-Levenshtein>=0.12.0,<0.22.0 + python-Levenshtein>=0.12.0,<0.26.0 ldap = python-ldap>=3.0.0,<3.5.0 Flask-SimpleLDAP>=1.4.0,<1.5.0 @@ -90,10 +90,10 @@ oauth = Flask-Dance>=2.0.0,<7.1.0 SQLAlchemy-Utils>=0.33.5,<0.42.0 metadata = - rarfile>=3.2 + rarfile>=3.2,<4.2 scholarly>=1.2.0,<1.8 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 beautifulsoup4>=4.0.1,<4.13.0 faust-cchardet>=2.1.18,<2.1.20 diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index bf5558ad..7b204313 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
Start Time: 2024-02-24 19:10:31
+Start Time: 2024-02-25 20:10:53
Stop Time: 2024-02-25 02:03:41
+Stop Time: 2024-02-26 02:57:24
Duration: 5h 43 min
+Duration: 5h 36 min
Traceback (most recent call last): - File "/home/ozzie/Development/calibre-web-test/test/test_backup_metadata.py", line 339, in test_backup_change_book_description - self.assertEqual(metadata['description'], "") -AssertionError: '<p><strong>Test</strong></p>' != ''+ File "/home/ozzie/Development/calibre-web-test/test/test_backup_metadata.py", line 263, in test_backup_change_book_identifier + self.assertEqual(len(metadata['identifier']), 3) +AssertionError: 2 != 3
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_backup_metadata.py", line 160, in test_backup_change_book_publisher + self.assertEqual(metadata['publisher'], 'Lo,执|1u') +AssertionError: '' != 'Lo,执|1u' ++ Lo,执|1u+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_backup_metadata_gdrive.py", line 109, in test_backup_gdrive + self.assertTrue(fs.isfile(remote_meta.replace('\\', '/'))) +AssertionError: False is not true+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py", line 132, in test_convert_wrong_excecutable + self.assertEqual(element.text, 'Execution permissions missing') +AttributeError: 'bool' object has no attribute 'text'+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py", line 77, in tearDown + self.login('admin', 'admin123') + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 91, in login + WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "username"))) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py", line 95, in until + raise TimeoutException(message, screen, stacktrace) +selenium.common.exceptions.TimeoutException: Message: +Stacktrace: +RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 +WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:191:5 +NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:509:5 +dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py", line 569, in test_convert_xss + task_len, ret = self.check_tasks(tasks) +ValueError: too many values to unpack (expected 2)+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py", line 610, in test_user_convert_xss + self.assertEqual(ret[-1]['result'], 'Finished') +AssertionError: 'Failed' != 'Finished' +- Failed ++ Finished+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py", line 102, in test_convert_wrong_excecutable + self.assertEqual(element.text, 'Execution permissions missing') +AttributeError: 'bool' object has no attribute 'text'+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py", line 63, in tearDown + self.login('admin', 'admin123') + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 91, in login + WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "username"))) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py", line 95, in until + raise TimeoutException(message, screen, stacktrace) +selenium.common.exceptions.TimeoutException: Message: +Stacktrace: +RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 +WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:191:5 +NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:509:5 +dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py", line 148, in test_convert_wrong_excecutable + self.assertEqual(element.text, 'Execution permissions missing') +AttributeError: 'bool' object has no attribute 'text'+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py", line 111, in tearDown + self.login('admin', 'admin123') + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 91, in login + WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "username"))) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py", line 95, in until + raise TimeoutException(message, screen, stacktrace) +selenium.common.exceptions.TimeoutException: Message: +Stacktrace: +RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 +WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:191:5 +NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:509:5 +dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_goodreads.py", line 84, in test_author_page_invalid + self.assertEqual(1, len(self.get_books_displayed()[1])) +AssertionError: 1 != 0+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_goodreads.py", line 121, in test_goodreads_about + self.assertTrue(self.goto_page('nav_about')) +AssertionError: False is not true+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 454, in test_LDAP_import + self.assertTrue('0 User' in self.check_element_on_page((By.ID, "DialogContent")).text) +AssertionError: False is not true+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 279, in test_LDAP_import_memberfield + self.fill_basic_config({'config_ldap_provider_url': '127.0.0.1', + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 391, in fill_basic_config + cls._fill_basic_config(elements) + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 304, in _fill_basic_config + WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "config_port"))) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py", line 95, in until + raise TimeoutException(message, screen, stacktrace) +selenium.common.exceptions.TimeoutException: Message: +Stacktrace: +RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 +WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:191:5 +NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:509:5 +dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 223, in test_LDAP_login + self.fill_basic_config({'config_ldap_provider_url': '127.0.0.1', + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 391, in fill_basic_config + cls._fill_basic_config(elements) + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 304, in _fill_basic_config + WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "config_port"))) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py", line 95, in until + raise TimeoutException(message, screen, stacktrace) +selenium.common.exceptions.TimeoutException: Message: +Stacktrace: +RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 +WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:191:5 +NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:509:5 +dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 116, in test_invalid_LDAP + self.fill_basic_config({'config_ldap_provider_url': 'example.org', + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 391, in fill_basic_config + cls._fill_basic_config(elements) + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 304, in _fill_basic_config + WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "config_port"))) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py", line 95, in until + raise TimeoutException(message, screen, stacktrace) +selenium.common.exceptions.TimeoutException: Message: +Stacktrace: +RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 +WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:191:5 +NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:509:5 +dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 761, in test_ldap_about + self.assertTrue(self.goto_page('nav_about')) +AssertionError: False is not true+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 764, in test_ldap_authentication + self.fill_basic_config({'config_ldap_provider_url': '127.0.0.1', + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 391, in fill_basic_config + cls._fill_basic_config(elements) + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 304, in _fill_basic_config + WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "config_port"))) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py", line 95, in until + raise TimeoutException(message, screen, stacktrace) +selenium.common.exceptions.TimeoutException: Message: +Stacktrace: +RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 +WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:191:5 +NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:509:5 +dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 1032, in test_ldap_kobo_sync + self.fill_basic_config({'config_ldap_provider_url': '127.0.0.1', + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 391, in fill_basic_config + cls._fill_basic_config(elements) + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 304, in _fill_basic_config + WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "config_port"))) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py", line 95, in until + raise TimeoutException(message, screen, stacktrace) +selenium.common.exceptions.TimeoutException: Message: +Stacktrace: +RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 +WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:191:5 +NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:509:5 +dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 931, in test_ldap_opds_anonymous + self.fill_basic_config({'config_ldap_provider_url': '127.0.0.1', + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 391, in fill_basic_config + cls._fill_basic_config(elements) + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 304, in _fill_basic_config + WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "config_port"))) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py", line 95, in until + raise TimeoutException(message, screen, stacktrace) +selenium.common.exceptions.TimeoutException: Message: +Stacktrace: +RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 +WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:191:5 +NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:509:5 +dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 841, in test_ldap_opds_download_book + self.fill_basic_config({'config_ldap_provider_url': '127.0.0.1', + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 391, in fill_basic_config + cls._fill_basic_config(elements) + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 304, in _fill_basic_config + WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "config_port"))) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/support/wait.py", line 95, in until + raise TimeoutException(message, screen, stacktrace) +selenium.common.exceptions.TimeoutException: Message: +Stacktrace: +RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 +WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:191:5 +NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:509:5 +dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16+