webchanges 3.31.4__tar.gz → 3.34.0__tar.gz

{webchanges-3.31.4/webchanges.egg-info → webchanges-3.34.0}/PKG-INFO

@@ -1,75 +1,10 @@
 Metadata-Version: 2.4
 Name: webchanges
-Version: 3.31.4
+Version: 3.34.0
 Summary: Web Changes Delivered. AI-Summarized. Totally Anonymous.
 Author-email: Mike Borsetti <mike+webchanges@borsetti.com>
 Maintainer-email: Mike Borsetti <mike+webchanges@borsetti.com>
-License: ========
-        Licenses
-        ========
-        
-        The MIT License (MIT)
-        
-        Copyright (c) 2020- Mike Borsetti <mike@borsetti.com>
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy of
-        this software and associated documentation files (the "Software"), to deal in
-        the Software without restriction, including without limitation the rights to
-        use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-        the Software, and to permit persons to whom the Software is furnished to do so,
-        subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-        FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-        COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-        IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-        CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-        
-        --------------------------------------------------------------------------------
-        
-        SOURCE CODE REDISTRIBUTION NOTICE
-        (urlwatch by Thomas Perl)
-        
-        This software redistributes source code of release 2.21, dated 30 July 2020, of
-        urlwatch
-        https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f,
-        which is subject to the following copyright notice and license (from
-        https://raw.githubusercontent.com/thp/urlwatch/346b25914b0418342ffe2fb0529bed702fddc01f/COPYING),
-        hereby retained and redistributed with the source code (of which this license
-        file is part of), in binary form, and in the documentation. The appearance of
-        the name of the author below does not constitute an endorsement or promotion of
-        this software by such author.
-        
-        Copyright (c) 2008-2020 Thomas Perl <m@thp.io>
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions
-        are met:
-        
-        1. Redistributions of source code must retain the above copyright
-           notice, this list of conditions and the following disclaimer.
-        2. Redistributions in binary form must reproduce the above copyright
-           notice, this list of conditions and the following disclaimer in the
-           documentation and/or other materials provided with the distribution.
-        3. The name of the author may not be used to endorse or promote products
-           derived from this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR
-        IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-        OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-        IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-        INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-        NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-        THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-        THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
+License-Expression: MIT AND BSD-3-Clause
 Project-URL: Documentation, https://webchanges.readthedocs.io/
 Project-URL: Repository, https://github.com/mborsetti/webchanges/
 Project-URL: Changelog, https://webchanges.readthedocs.io/en/stable/changelog.html
@@ -81,18 +16,17 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: BSD License
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: Free Threading
+Classifier: Programming Language :: Python :: Free Threading :: 4 - Resilient
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Internet
 Classifier: Topic :: Internet :: WWW/HTTP
@@ -100,7 +34,7 @@ Classifier: Topic :: Internet :: WWW/HTTP :: Indexing/Search
 Classifier: Topic :: System :: Monitoring
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.md
 Requires-Dist: colorama; sys_platform == "win32"
@@ -189,6 +123,8 @@ For the best experience, use the current version of `Python <https://www.python.
 older Python versions for 3 years after they're replaced by a newer one; we just ask that you use the most up-to-date
 bug and security fix release from that older version.
 
+While **webchanges** supports free-threated Python, certain optional dependencies may not.
+
 For Generative AI summaries (BETA), you need a free `API Key from Google Cloud AI Studio
 <https://aistudio.google.com/app/apikey>`__ (see `here
 <https://webchanges.readthedocs.io/en/stable/differs.html#ai-google>`__).
@@ -216,6 +152,11 @@ Running in Docker
 implementation (no browser) `here <https://github.com/yubiuser/webchanges-docker>`__, and one with a browser
 `here <https://github.com/jhedlund/webchanges-docker>`__.
 
+As a GitHub Action
+------------------
+**webchanges** can easily run as a `GitHub Action <https://www.docker.com/>`__! You will find an implementation 
+`here <https://github.com/swimmwatch/webchanges-action>`__.
+
 
 Documentation |readthedocs|
 ===========================

{webchanges-3.31.4 → webchanges-3.34.0}/README.rst

@@ -22,6 +22,8 @@ For the best experience, use the current version of `Python <https://www.python.
 older Python versions for 3 years after they're replaced by a newer one; we just ask that you use the most up-to-date
 bug and security fix release from that older version.
 
+While **webchanges** supports free-threated Python, certain optional dependencies may not.
+
 For Generative AI summaries (BETA), you need a free `API Key from Google Cloud AI Studio
 <https://aistudio.google.com/app/apikey>`__ (see `here
 <https://webchanges.readthedocs.io/en/stable/differs.html#ai-google>`__).
@@ -49,6 +51,11 @@ Running in Docker
 implementation (no browser) `here <https://github.com/yubiuser/webchanges-docker>`__, and one with a browser
 `here <https://github.com/jhedlund/webchanges-docker>`__.
 
+As a GitHub Action
+------------------
+**webchanges** can easily run as a `GitHub Action <https://www.docker.com/>`__! You will find an implementation 
+`here <https://github.com/swimmwatch/webchanges-action>`__.
+
 
 Documentation |readthedocs|
 ===========================

{webchanges-3.31.4 → webchanges-3.34.0}/pyproject.toml

@@ -6,9 +6,9 @@
 
 [build-system]
 # Minimum requirements for the build system to execute.
-requires = ['setuptools'] # PEP 508 specifications.
+requires = ['argparse-manpage[setuptools]'] # PEP 508 specifications.
 # Setuptools specification
-build-backend = "setuptools.build_meta"
+build-backend = 'setuptools.build_meta'
 
 [project]
 # See https://packaging.python.org/en/latest/specifications/declaring-project-metadata/
@@ -16,8 +16,9 @@ dynamic = ['version', 'dependencies']
 name = 'webchanges'
 description = 'Web Changes Delivered. AI-Summarized. Totally Anonymous.'
 readme = { file = 'README.rst', content-type = 'text/x-rst' }
-requires-python = '>=3.10'
-license = { file = 'LICENSE.md' }
+requires-python = '>=3.11'
+license = "MIT AND BSD-3-Clause"
+license-files = ['LICENSE.md']
 authors = [{ name = 'Mike Borsetti', email = 'mike+webchanges@borsetti.com' }]
 maintainers = [
     { name = 'Mike Borsetti', email = 'mike+webchanges@borsetti.com' },
@@ -29,18 +30,17 @@ classifiers = [
     'Intended Audience :: Developers',
     'Intended Audience :: End Users/Desktop',
     'Intended Audience :: System Administrators',
-    'License :: OSI Approved :: BSD License',
-    'License :: OSI Approved :: MIT License',
     'Natural Language :: English',
     'Operating System :: OS Independent',
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3 :: Only',
-    'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: 3.13',
     'Programming Language :: Python :: 3.14',
+    'Programming Language :: Python :: Free Threading',
+    'Programming Language :: Python :: Free Threading :: 4 - Resilient',
     'Programming Language :: Python :: Implementation :: CPython',
     'Topic :: Internet',
     'Topic :: Internet :: WWW/HTTP',
@@ -88,6 +88,7 @@ xmpp = ['aioxmpp']
 redis = ['redis']
 requests = ['requests']
 safe_password = ['keyring']
+# all
 all = [
     'webchanges[use_browser,beautify,bs4,html5lib,ical2text,jq,ocr,pdf2text,pypdf_crypto,deepdiff_xml,imagediff,matrix,pushbullet,pushover,xmpp,redis,requests,safe_password]',
 ]
@@ -109,6 +110,10 @@ dependencies = { file = 'requirements.txt' }
 [tool.setuptools.package-data]
 'webchanges' = ['py.typed']
 
+# -------------------------- manpages --------------------------
+# https://github.com/praiskup/argparse-manpage/blob/main/README.md
+[tool.build_manpages]
+manpages = ['man/webchanges.1:function=get_parser:pyfile=get_parser']
 
 # -------------------------- coverage --------------------------
 [tool.coverage.run]
@@ -170,60 +175,6 @@ exclude_lines = [
 # ignore_errors = true
 
 
-# -------------------------- mypy --------------------------
-[tool.mypy]
-# Static Typing for Python
-# Runs as part of pre-commit
-# Config file documentation at https://mypy.readthedocs.io/en/stable/config_file.html
-
-# Disables import discovery of namespace packages (see PEP 420)
-namespace_packages = true
-
-# Specifies the Python version used to parse and check the target program.
-# python_version = 3.12
-
-# Suppresses error messages about imports that cannot be resolved.
-ignore_missing_imports = true
-
-# Disallows calling functions without type annotations from functions with type annotations.
-disallow_untyped_calls = false
-
-# Disallows defining functions without type annotations or with incomplete type annotations.
-disallow_untyped_defs = true
-
-# Reports an error whenever a function with type annotations is decorated with a decorator without annotations.
-disallow_untyped_decorators = true
-
-# Warns about casting an expression to its inferred type.
-warn_redundant_casts = true
-
-# Warns about unneeded # type: ignore comments.
-# May behave differently in GitHub Actions than it does on Windows.
-# warn_unused_ignores = true
-
-# Shows a warning when returning a value with type Any from a function declared with a non-Any return type.
-warn_return_any = true
-
-# Shows a warning when encountering any code inferred to be unreachable or redundant after performing type analysis.
-warn_unreachable = false
-
-# Enables additional checks that are technically correct but may be impractical in real code.
-extra_checks = true
-
-# Shows documentation link to corresponding error code.
-show_error_code_links = true
-
-# Use visually nicer output in error messages: use soft word wrap, show source code snippets, and show error location
-# markers.
-pretty = true
-
-# Use an SQLite database to store the cache.
-sqlite_cache = true
-
-# Warns about per-module sections in the config file that do not match any files processed when invoking mypy.
-warn_unused_configs = true
-
-
 # -------------------------- rstcheck --------------------------
 [tool.rstcheck]
 # Checks syntax of reStructuredText and code blocks nested within it.
@@ -240,12 +191,15 @@ report_level = 'WARNING'
 # Testing framework
 # Config file documentation at https://docs.pytest.org/en/stable/reference/reference.html#ini-options-ref
 
-log_auto_indent = true
+# log_auto_indent = 2
 # Enable log display during test run (aka "live logging" https://docs.pytest.org/en/stable/logging.html#live-logs)
-log_cli = true
-minversion = '8.4.1'
+# log_cli = true
+minversion = '9.0.2'
 testpaths = ['tests']
 
+# pytest-playwright
+# addopts = ['--browser', 'chromium', '--browser-channel', 'chrome']
+
 # Adds pytest-cov functionality (see https://pytest-cov.readthedocs.io/en/latest/config.html)
 # Note: --cov moved to .github/workflows/ci-cd.yaml and tox.ini due to interference with PyCharm breakpoints (see
 # https://github.com/pytest-dev/pytest-cov/issues/131) and to enable running tox --parallel
@@ -258,10 +212,7 @@ testpaths = ['tests']
 # Config file documentation at https://docs.astral.sh/ruff/configuration/ and https://docs.astral.sh/ruff/settings/
 
 # File patterns to omit from formatting and linting, in addition to those specified by exclude.
-extend-exclude = [
-    "webchanges/storage_minidb.py",
-    "webchanges/_vendored",
-]
+extend-exclude = ['webchanges/storage_minidb.py', 'webchanges/_vendored']
 
 # By default, Ruff will discover files matching *.py, *.pyi, *.ipynb, or pyproject.toml.
 # Include additional files
@@ -271,83 +222,90 @@ extend-exclude = [
 line-length = 120
 
 # Target Python version
-# target-version = "py311"  # Commented out to infer from [project] requires-python
+# target-version = 'py311'  # Commented out to infer from [project] requires-python
 
 [tool.ruff.lint]
 # By default, Ruff enables Flake8's F rules, along with a subset of the E rules
 # Enable rules not enabled by default, and ignore specific rules.
 select = [
-    "ANN",  # flake8-annotations
-    "S",    # flake8-bandit
-    "BLE",  # flake8-blind-except
-    "B",    # flake8-bugbear
-    "A",    # flake8-builtin
-    "C4",   # flake8-comprehensions
-    "DTZ",  # flake8-datetimez
-    # "EM",   # flake8-errmsg  # TODO
-    "FA",   # flake8-future-annotations
-    "INT",  # flake8-gettext
-    "ISC",  # flake8-implicit-str-concat
-    "LOG",  # flake8-logging
-    # "G",    # flake8-logging-format  # TODO
-    "PIE",  # flake8-pie
-    "PYI",  # flake8-pyi
-    "PT",   # flake8-pytest-style
-    "Q",    # flake8-quotes
-    "RSE",  # flake8-raise
-    "RET",  # flake8-return
-    "SIM",  # flake8-simplify
-    "TID",  # flake8-tidy-imports
-    "TD",   # flake8-todos
-    "TC",   # flake8-type-checking
-    # "ARG",  # flake8-unused-arguments  # TODO
-    "PTH",  # flake8-use-pathlib
-    # "FLY",  # flynt   # TODO
-    "I",    # isort
-    "C90",  # mccabe 
-    "N",    # pep8-naming
-    "PERF", # Perflint
-    "E",    # pycodestyle errors
-    "W",    # pycodestyle warnings
-    # "DOC",  # pydoclint  # TODO
-    # "D",    # pydocstyle  # TODO
-    "F",    # Pyflakes
-    # "PL",   # Pylint  # TODO
-    "FURB", # refurb 
-    "RUF",  # Ruff-specific rules
-    # "TRY",  # tryceratops  # TODO
+    'ANN', # flake8-annotations
+    'S',   # flake8-bandit
+    'BLE', # flake8-blind-except
+    'B',   # flake8-bugbear
+    'A',   # flake8-builtin
+    'C4',  # flake8-comprehensions
+    'DTZ', # flake8-datetimez
+    # 'EM',   # flake8-errmsg  # TODO
+    'FA',  # flake8-future-annotations
+    'INT', # flake8-gettext
+    'ISC', # flake8-implicit-str-concat
+    'LOG', # flake8-logging
+    # 'G',    # flake8-logging-format  # Prefer f-string to lazy `%` formatting and OK with '+'
+    'PIE', # flake8-pie
+    'PYI', # flake8-pyi
+    'PT',  # flake8-pytest-style
+    'Q',   # flake8-quotes
+    'RSE', # flake8-raise
+    'RET', # flake8-return
+    'SIM', # flake8-simplify
+    'TID', # flake8-tidy-imports
+    'TD',  # flake8-todos
+    'TC',  # flake8-type-checking
+    # 'ARG',  # flake8-unused-arguments  # Code loses clarity
+    'PTH',  # flake8-use-pathlib
+    'FLY',  # flynt
+    'I',    # isort
+    'C90',  # mccabe 
+    'N',    # pep8-naming
+    'PERF', # Perflint
+    'E',    # pycodestyle errors
+    'W',    # pycodestyle warnings
+    # 'DOC',  # pydoclint  # TODO
+    # 'D',    # pydocstyle  # TODO
+    'F', # Pyflakes
+    # 'PL',   # Pylint  # TODO
+    'FURB', # refurb 
+    'RUF',  # Ruff-specific rules
+    # 'TRY',  # tryceratops  # TODO
 ]
 
 ignore = [
-    "PT011",  # pytest.raises({exception}) is too broad, set the match parameter or use a more specific exception
-    "PT030",  # pytest.warns({warning}) is too broad, set the match parameter or use a more specific warning
-    "RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
-    "SIM105", # Use contextlib.suppress({exception}) instead of try-except-pass
-    "SIM115", # Use a context manager for opening files
-    "TD002",  #	Missing author in TODO
-    "TD003",  # Missing issue link for this TODO
+    'FLY002', # Consider f-string instead of string join
+    # 'G003',    # Logging statement uses `+`'
+    # 'G004',    # Logging statement uses f-string (Prefer f-string to lazy `%` formatting)
+    'PLC0415', # `import` should be at the top-level of a file
+    'PT011',   # pytest.raises({exception}) is too broad, set the match parameter or use a more specific exception
+    'PT030',   # pytest.warns({warning}) is too broad, set the match parameter or use a more specific warning
+    'RUF012',  # Mutable class attributes should be annotated with `typing.ClassVar`
+    'SIM105',  # Use contextlib.suppress({exception}) instead of try-except-pass
+    'SIM115',  # Use a context manager for opening files
+    'TD002',   #	Missing author in TODO
+    'TD003',   # Missing issue link for this TODO
 ]
 
 # Allow fix for all enabled rules (when `--fix`) is provided.
-fixable = ["ALL"]
+fixable = ['ALL']
 unfixable = []
 
 # Allow unused variables when underscore-prefixed.
-dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+dummy-variable-rgx = '^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$'
+
+# List of allowed 'confusable' Unicode characters to ignore when enforcing RUF001, RUF002, and RUF003.
+allowed-confusables = ['–', '‘', '’']
 
 [tool.ruff.lint.flake8-annotations]
-allow-star-arg-any = true  # TODO
+allow-star-arg-any = true # TODO
 
 [tool.ruff.lint.flake8-quotes]
-inline-quotes = "single"
+inline-quotes = 'single'
 
 [tool.ruff.lint.mccabe]
 # Flag errors (`C901`) whenever the complexity level exceeds below.
 max-complexity = 30
 
 [tool.ruff.lint.per-file-ignores]
-"tests/*" = [
-    "S101",  # Use of `assert` detected
+'tests/*' = [
+    'S101', # Use of `assert` detected
 ]
 
 [tool.ruff.lint.pydoclint]
@@ -355,7 +313,7 @@ max-complexity = 30
 ignore-one-line-docstrings = true
 
 [tool.ruff.lint.pydocstyle]
-convention = "google"
+convention = 'google'
 
 [tool.ruff.format]
 # Enable the formatter, which is a drop-in replacement for Black.
@@ -365,16 +323,16 @@ convention = "google"
 exclude = []
 
 # Use single quotes for strings.
-quote-style = "single"
+quote-style = 'single'
 
 # Like Black, indent with spaces, rather than tabs.
-indent-style = "space"
+indent-style = 'space'
 
 # Like Black, respect magic trailing commas.
 skip-magic-trailing-comma = false
 
 # Like Black, automatically detect the appropriate line ending.
-line-ending = "auto"
+line-ending = 'auto'
 
 # Enable auto-formatting of code examples in docstrings. Markdown,
 # reStructuredText code/literal blocks and doctests are all supported.
@@ -388,4 +346,14 @@ docstring-code-format = true
 #
 # This only has an effect when the `docstring-code-format` setting is
 # enabled.
-docstring-code-line-length = "dynamic"
+docstring-code-line-length = 'dynamic'
+
+
+# -------------------------- ty --------------------------
+# Config file documentation at https://docs.astral.sh/ty/reference/configuration/
+
+[tool.ty.environment]
+extra-paths = ['./webchanges']
+
+[tool.ty.src]
+exclude = ['./webchanges/storage_minidb.py']

{webchanges-3.31.4 → webchanges-3.34.0}/webchanges/__init__.py

@@ -12,7 +12,7 @@ supported services. Can check the output of local commands as well.
 
 from __future__ import annotations
 
-__min_python_version__ = (3, 10)  # minimum version of Python required to run; supported until fall 2025
+__min_python_version__ = (3, 11)  # minimum version of Python required to run; 3.11 supported until fall 2026
 
 
 __project_name__ = str(__package__)
@@ -22,7 +22,7 @@ __project_name__ = str(__package__)
 # * MINOR version when you add functionality in a backwards compatible manner, and
 # * MICRO or PATCH version when you make backwards compatible bug fixes. We no longer use '0'
 # If unsure on increments, use pkg_resources.parse_version to parse
-__version__ = '3.31.4'
+__version__ = '3.34.0'
 __description__ = (
     'Check web (or command output) for changes since last run and notify.\n\nAnonymously alerts you of web changes.'
 )

{webchanges-3.31.4 → webchanges-3.34.0}/webchanges/_vendored/headers.py

@@ -50,7 +50,7 @@ def to_str(value: str | bytes, encoding: str = 'utf-8') -> str:
 
 
 def to_bytes_or_str(value: str, match_type_of: typing.AnyStr) -> typing.AnyStr:
-    return value if isinstance(match_type_of, str) else value.encode()
+    return value if isinstance(match_type_of, str) else value.encode()  # ty:ignore[invalid-return-type]
 
 
 # from https://github.com/encode/httpx/blob/master/httpx/_models.py
@@ -81,8 +81,8 @@ def _obfuscate_sensitive_headers(
     items: typing.Iterable[tuple[typing.AnyStr, typing.AnyStr]],
 ) -> typing.Iterator[tuple[typing.AnyStr, typing.AnyStr]]:
     for k, v in items:
-        if to_str(k.lower()) in SENSITIVE_HEADERS:
-            v = to_bytes_or_str('[secure]', match_type_of=v)
+        if to_str(k.lower()) in SENSITIVE_HEADERS:  # ty:ignore[no-matching-overload, invalid-argument-type]
+            v = to_bytes_or_str('[secure]', match_type_of=v)  # ty:ignore[invalid-argument-type]
         yield k, v
 
 
@@ -102,8 +102,8 @@ class Headers(typing.MutableMapping[str, str]):
             self._list = list(headers._list)
         elif isinstance(headers, Mapping):
             for k, v in headers.items():
-                bytes_key = _normalize_header_key(k, encoding)
-                bytes_value = _normalize_header_value(v, encoding)
+                bytes_key = _normalize_header_key(k, encoding)  # ty:ignore[invalid-argument-type]
+                bytes_value = _normalize_header_value(v, encoding)  # ty:ignore[invalid-argument-type]
                 self._list.append((bytes_key, bytes_key.lower(), bytes_value))
         elif headers is not None:
             for k, v in headers:

{webchanges-3.31.4 → webchanges-3.34.0}/webchanges/cli.py

@@ -24,9 +24,14 @@ from webchanges import __copyright__, __docs_url__, __min_python_version__, __pr
 from webchanges.config import CommandConfig
 from webchanges.util import file_ownership_checks, get_new_version_number, import_module_from_source
 
-# Ignore signal SIGPIPE ("broken pipe") for stdout (see https://github.com/thp/urlwatch/issues/77)
-if os.name != 'nt':  # Windows does not have signal.SIGPIPE
+# Restore the default system behavior for the SIGPIPE signal, which is ignored by Python by default.
+# This prevents a BrokenPipeError when piping output to a command like `less` that may close the pipe before reading all
+# of the output.
+try:
     signal.signal(signal.SIGPIPE, signal.SIG_DFL)  # type: ignore[attr-defined]  # not defined in Windows
+except AttributeError:
+    pass
+
 
 logger = logging.getLogger(__name__)
 
@@ -376,7 +381,7 @@ def main() -> None:  # pragma: no cover
     python_version_warning()
 
     # Path where the config, jobs and hooks files are located
-    if os.name != 'nt':
+    if sys.platform != 'win32':
         config_path = platformdirs.user_config_path(__project_name__)  # typically ~/.config/{__project_name__}
     else:
         config_path = platformdirs.user_documents_path().joinpath(__project_name__)
@@ -471,10 +476,8 @@ def main() -> None:  # pragma: no cover
     config_storage.load()
 
     # Setup database API
-    database_engine = (
-        command_config.database_engine or config_storage.config.get('database', {}).get('engine') or 'sqlite3'
-    )  # "or 'sqlite3'" is not needed except for a mypy bug; same for the "or 4" below
-    max_snapshots = command_config.max_snapshots or config_storage.config.get('database', {}).get('max_snapshots') or 4
+    database_engine = command_config.database_engine or config_storage.config.get('database', {}).get('engine')
+    max_snapshots = command_config.max_snapshots or config_storage.config.get('database', {}).get('max_snapshots')
     if database_engine == 'sqlite3':
         ssdb_storage: SsdbStorage = SsdbSQLite3Storage(command_config.ssdb_file, max_snapshots)  # storage.py
     elif any(str(command_config.ssdb_file).startswith(prefix) for prefix in ('redis://', 'rediss://')):