webchanges 3.31.1__tar.gz → 3.31.3__tar.gz

{webchanges-3.31.1/webchanges.egg-info → webchanges-3.31.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webchanges
-Version: 3.31.1
+Version: 3.31.3
 Summary: Web Changes Delivered. AI-Summarized. Totally Anonymous.
 Author-email: Mike Borsetti <mike+webchanges@borsetti.com>
 Maintainer-email: Mike Borsetti <mike+webchanges@borsetti.com>
@@ -76,15 +76,15 @@ Project-URL: Changelog, https://webchanges.readthedocs.io/en/stable/changelog.ht
 Project-URL: Issues, https://github.com/mborsetti/webchanges/issues
 Project-URL: CI, https://github.com/mborsetti/webchanges/actions
 Keywords: webmonitoring,monitoring
-Classifier: Environment :: Console
-Classifier: Topic :: Internet
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Topic :: Internet :: WWW/HTTP :: Indexing/Search
-Classifier: Topic :: System :: Monitoring
-Classifier: Topic :: Utilities
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
+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
@@ -93,12 +93,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Operating System :: OS Independent
-Classifier: Environment :: Console
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Intended Audience :: System Administrators
-Classifier: Intended Audience :: Developers
-Classifier: Natural Language :: English
+Classifier: Topic :: Internet
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Topic :: Internet :: WWW/HTTP :: Indexing/Search
+Classifier: Topic :: System :: Monitoring
+Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
@@ -178,7 +177,7 @@ webchanges |downloads|
 
 **webchanges** *anonymously* checks web content (including images) and commands for changes, delivering instant
 notifications and AI-powered summaries to your favorite `platform
-<https://webchanges.readthedocs.io/en/stable/introduction.html#reporters-list>`__.
+<https://webchanges.readthedocs.io/en/stable/introduction.html#reporters>`__.
 
 
 Requirements
@@ -293,14 +292,13 @@ licensed under a `BSD 3-Clause License
 <https://raw.githubusercontent.com/thp/urlwatch/346b25914b0418342ffe2fb0529bed702fddc01f/COPYING>`__).
 
 
-Compatibility **urlwatch**
-===========================
+Compatibility with **urlwatch**
+===============================
 
 This project is based on code from `urlwatch 2.21
 <https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f>`__ dated 30 July 2020.
-
 For upgrading from **urlwatch** to **webchanges** (using the same job and
-configuration files), see `here <https://webchanges.readthedocs.io/en/stable/upgrading.html>`__). 
+configuration files), see `here <https://webchanges.readthedocs.io/en/stable/upgrading.html>`__. 
 
 
 .. |support| image:: https://img.shields.io/pypi/pyversions/webchanges.svg

{webchanges-3.31.1 → webchanges-3.31.3}/README.rst

@@ -11,7 +11,7 @@ webchanges |downloads|
 
 **webchanges** *anonymously* checks web content (including images) and commands for changes, delivering instant
 notifications and AI-powered summaries to your favorite `platform
-<https://webchanges.readthedocs.io/en/stable/introduction.html#reporters-list>`__.
+<https://webchanges.readthedocs.io/en/stable/introduction.html#reporters>`__.
 
 
 Requirements
@@ -126,14 +126,13 @@ licensed under a `BSD 3-Clause License
 <https://raw.githubusercontent.com/thp/urlwatch/346b25914b0418342ffe2fb0529bed702fddc01f/COPYING>`__).
 
 
-Compatibility **urlwatch**
-===========================
+Compatibility with **urlwatch**
+===============================
 
 This project is based on code from `urlwatch 2.21
 <https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f>`__ dated 30 July 2020.
-
 For upgrading from **urlwatch** to **webchanges** (using the same job and
-configuration files), see `here <https://webchanges.readthedocs.io/en/stable/upgrading.html>`__). 
+configuration files), see `here <https://webchanges.readthedocs.io/en/stable/upgrading.html>`__. 
 
 
 .. |support| image:: https://img.shields.io/pypi/pyversions/webchanges.svg

{webchanges-3.31.1 → webchanges-3.31.3}/pyproject.toml

@@ -26,15 +26,15 @@ maintainers = [
 ]
 keywords = ['webmonitoring', 'monitoring']
 classifiers = [
-    'Environment :: Console',
-    'Topic :: Internet',
-    'Topic :: Internet :: WWW/HTTP',
-    'Topic :: Internet :: WWW/HTTP :: Indexing/Search',
-    'Topic :: System :: Monitoring',
-    'Topic :: Utilities',
     'Development Status :: 5 - Production/Stable',
-    'License :: OSI Approved :: MIT License',
+    'Environment :: Console',
+    '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',
@@ -43,12 +43,11 @@ classifiers = [
     'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: 3.13',
     'Programming Language :: Python :: Implementation :: CPython',
-    'Operating System :: OS Independent',
-    'Environment :: Console',
-    'Intended Audience :: End Users/Desktop',
-    'Intended Audience :: System Administrators',
-    'Intended Audience :: Developers',
-    'Natural Language :: English',
+    'Topic :: Internet',
+    'Topic :: Internet :: WWW/HTTP',
+    'Topic :: Internet :: WWW/HTTP :: Indexing/Search',
+    'Topic :: System :: Monitoring',
+    'Topic :: Utilities',
     'Typing :: Typed',
 ]
 

{webchanges-3.31.1 → webchanges-3.31.3}/webchanges/__init__.py

@@ -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.1'
+__version__ = '3.31.3'
 __description__ = (
     'Check web (or command output) for changes since last run and notify.\n\nAnonymously alerts you of web changes.'
 )

{webchanges-3.31.1 → webchanges-3.31.3}/webchanges/jobs.py

@@ -62,7 +62,6 @@ else:
 
 try:
     import requests
-    import requests.adapters
     import urllib3
     import urllib3.exceptions
 except ImportError as e:  # pragma: no cover
@@ -71,6 +70,15 @@ except ImportError as e:  # pragma: no cover
 
 logger = logging.getLogger(__name__)
 
+
+# Custom YAML representer function for httpx.Headers
+def represent_headers(dumper: yaml.SafeDumper, data: Headers) -> yaml.MappingNode:
+    return dumper.represent_dict(dict(data))
+
+
+# Add the custom representer to the SafeDumper
+yaml.SafeDumper.add_representer(Headers, represent_headers)
+
 # reduce logging from httpx's sub-modules
 if httpx is not None and logger.getEffectiveLevel() == logging.DEBUG:
     logging.getLogger('hpack').setLevel(logging.INFO)
@@ -1556,6 +1564,7 @@ class BrowserJob(UrlJobBase):
                 try:
                     response = page.goto(
                         self.initialization_url,
+                        wait_until=self.wait_until,
                     )
                 except PlaywrightError as e:
                     logger.info(f'Job {self.index_number}: Website initialization page returned error {e}')
@@ -2016,16 +2025,8 @@ class ShellJob(Job):
         """
         needs_bytes = FilterBase.filter_chain_needs_bytes(self.filters)
         try:
-            return (
-                subprocess.run(  # noqa: S602 `shell=True`, security issue
-                    self.command,
-                    capture_output=True,
-                    shell=True,
-                    check=True,
-                    text=(not needs_bytes),
-                ).stdout,
-                '',
-                'application/octet-stream' if needs_bytes else 'text/plain',
+            response = subprocess.run(  # noqa: S602 `shell=True`, security issue
+                self.command, capture_output=True, shell=True, check=True, text=(not needs_bytes)
             )
         except subprocess.CalledProcessError as e:
             logger.info(f'Job {self.index_number}: Command: {e.cmd} ')
@@ -2033,6 +2034,7 @@ class ShellJob(Job):
             logger.info(f'Job {self.index_number}: stderr : {e.stderr}')
             logger.info(f'Job {self.index_number}: stdout : {e.stdout}')
             raise
+        return (response.stdout, '', 'application/octet-stream' if needs_bytes else 'text/plain')
 
     def format_error(self, exception: Exception, tb: str) -> str:
         """Format the error of the job if one is encountered.

{webchanges-3.31.1 → webchanges-3.31.3}/webchanges/reporters.py

@@ -977,10 +977,12 @@ class EMailReporter(TextReporter):
         filtered_job_states = list(self.report.get_filtered_job_states(self.job_states))
         subject = self.subject_with_args(filtered_job_states)
 
+        utf_8 = True
         if self.config['method'] == 'smtp':
             smtp_config = self.config['smtp']
             smtp_user = smtp_config['user'] or self.config['from']
             use_auth = smtp_config['auth']
+            utf_8 = smtp_config['utf-8']
             mailer: Mailer = SMTPMailer(
                 smtp_user,
                 smtp_config['host'],
@@ -999,11 +1001,9 @@ class EMailReporter(TextReporter):
                 self.report, self.config, self.job_states, self.duration, self.jobs_files, self.differ_defaults
             )
             body_html = '\n'.join(html_reporter.submit())
-            msg = mailer.msg(
-                self.config['from'], self.config['to'], subject, body_text, body_html, utf_8=smtp_config['utf-8']
-            )
+            msg = mailer.msg(self.config['from'], self.config['to'], subject, body_text, body_html, utf_8=utf_8)
         else:
-            msg = mailer.msg(self.config['from'], self.config['to'], subject, body_text, utf_8=smtp_config['utf-8'])
+            msg = mailer.msg(self.config['from'], self.config['to'], subject, body_text, utf_8=utf_8)
 
         mailer.send(msg)
 

{webchanges-3.31.1 → webchanges-3.31.3}/webchanges/storage.py

@@ -19,6 +19,7 @@ from collections import defaultdict
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
+from types import NoneType
 from typing import Any, Iterable, Iterator, Literal, TextIO, TypedDict
 
 import msgpack
@@ -37,11 +38,6 @@ try:
 except ImportError:  # pragma: no cover
     from webchanges._vendored.headers import Headers  # type: ignore[assignment]
 
-try:
-    from types import NoneType
-except ImportError:  # pragma: no cover # Python 3.9
-    NoneType = type(None)  # type: ignore[misc]
-
 try:
     import redis
 except ImportError as e:  # pragma: no cover

{webchanges-3.31.1 → webchanges-3.31.3/webchanges.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webchanges
-Version: 3.31.1
+Version: 3.31.3
 Summary: Web Changes Delivered. AI-Summarized. Totally Anonymous.
 Author-email: Mike Borsetti <mike+webchanges@borsetti.com>
 Maintainer-email: Mike Borsetti <mike+webchanges@borsetti.com>
@@ -76,15 +76,15 @@ Project-URL: Changelog, https://webchanges.readthedocs.io/en/stable/changelog.ht
 Project-URL: Issues, https://github.com/mborsetti/webchanges/issues
 Project-URL: CI, https://github.com/mborsetti/webchanges/actions
 Keywords: webmonitoring,monitoring
-Classifier: Environment :: Console
-Classifier: Topic :: Internet
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Topic :: Internet :: WWW/HTTP :: Indexing/Search
-Classifier: Topic :: System :: Monitoring
-Classifier: Topic :: Utilities
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
+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
@@ -93,12 +93,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Operating System :: OS Independent
-Classifier: Environment :: Console
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Intended Audience :: System Administrators
-Classifier: Intended Audience :: Developers
-Classifier: Natural Language :: English
+Classifier: Topic :: Internet
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Topic :: Internet :: WWW/HTTP :: Indexing/Search
+Classifier: Topic :: System :: Monitoring
+Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
@@ -178,7 +177,7 @@ webchanges |downloads|
 
 **webchanges** *anonymously* checks web content (including images) and commands for changes, delivering instant
 notifications and AI-powered summaries to your favorite `platform
-<https://webchanges.readthedocs.io/en/stable/introduction.html#reporters-list>`__.
+<https://webchanges.readthedocs.io/en/stable/introduction.html#reporters>`__.
 
 
 Requirements
@@ -293,14 +292,13 @@ licensed under a `BSD 3-Clause License
 <https://raw.githubusercontent.com/thp/urlwatch/346b25914b0418342ffe2fb0529bed702fddc01f/COPYING>`__).
 
 
-Compatibility **urlwatch**
-===========================
+Compatibility with **urlwatch**
+===============================
 
 This project is based on code from `urlwatch 2.21
 <https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f>`__ dated 30 July 2020.
-
 For upgrading from **urlwatch** to **webchanges** (using the same job and
-configuration files), see `here <https://webchanges.readthedocs.io/en/stable/upgrading.html>`__). 
+configuration files), see `here <https://webchanges.readthedocs.io/en/stable/upgrading.html>`__. 
 
 
 .. |support| image:: https://img.shields.io/pypi/pyversions/webchanges.svg