diff --git a/Dockerfile.py310 b/Dockerfile.py310 index d49c4578..c9b13d8c 100644 --- a/Dockerfile.py310 +++ b/Dockerfile.py310 @@ -31,7 +31,7 @@ FROM python:3.10-buster RUN apt-get update && \ apt-get install -y --no-install-recommends libdbus-1-dev libgirepository1.0-dev build-essential musl-dev bash dbus && \ rm -rf /var/lib/apt/lists/* -RUN pip install --no-cache-dir dbus-python PyGObject +RUN pip install --no-cache-dir dbus-python "PyGObject==3.44.2" # Apprise Setup VOLUME ["/apprise"] diff --git a/Dockerfile.py311 b/Dockerfile.py311 index 023079dd..5363d259 100644 --- a/Dockerfile.py311 +++ b/Dockerfile.py311 @@ -31,7 +31,7 @@ FROM python:3.11-buster RUN apt-get update && \ apt-get install -y --no-install-recommends libdbus-1-dev libgirepository1.0-dev build-essential musl-dev bash dbus && \ rm -rf /var/lib/apt/lists/* -RUN pip install --no-cache-dir dbus-python PyGObject +RUN pip install --no-cache-dir dbus-python "PyGObject==3.44.2" # Apprise Setup VOLUME ["/apprise"] diff --git a/apprise/plugins/NotifyAprs.py b/apprise/plugins/NotifyAprs.py index 981c01da..23321fb2 100644 --- a/apprise/plugins/NotifyAprs.py +++ b/apprise/plugins/NotifyAprs.py @@ -617,7 +617,7 @@ class NotifyAprs(NotifyBase): # see https://www.aprs.org/doc/APRS101.PDF pg. 71 payload = re.sub("[{}|~]+", "", payload) - payload = ( + payload = ( # pragma: no branch APRS_COMPILED_MAP.sub( lambda x: APRS_BAD_CHARMAP[x.group()], payload) ) diff --git a/apprise/plugins/NotifyBulkSMS.py b/apprise/plugins/NotifyBulkSMS.py index cf82a87a..0ea80647 100644 --- a/apprise/plugins/NotifyBulkSMS.py +++ b/apprise/plugins/NotifyBulkSMS.py @@ -248,7 +248,7 @@ class NotifyBulkSMS(NotifyBase): if not (self.targets or self.groups): # We have nothing to notify - self.logger.warning('There are no Twist targets to notify') + self.logger.warning('There are no BulkSMS targets to notify') return False # Send in batches if identified to do so diff --git a/apprise/plugins/NotifyMatrix.py b/apprise/plugins/NotifyMatrix.py index 8f3e77ff..cda251c5 100644 --- a/apprise/plugins/NotifyMatrix.py +++ b/apprise/plugins/NotifyMatrix.py @@ -727,28 +727,38 @@ class NotifyMatrix(NotifyBase): # "content_uri": "mxc://example.com/a-unique-key" # } - if self.version == MatrixVersion.V3: - # Prepare our payload - payloads.append({ - "body": attachment.name, - "info": { - "mimetype": attachment.mimetype, - "size": len(attachment), - }, - "msgtype": "m.image", - "url": response.get('content_uri'), - }) + # FUTURE if self.version == MatrixVersion.V3: + # FUTURE # Prepare our payload + # FUTURE payloads.append({ + # FUTURE "body": attachment.name, + # FUTURE "info": { + # FUTURE "mimetype": attachment.mimetype, + # FUTURE "size": len(attachment), + # FUTURE }, + # FUTURE "msgtype": "m.image", + # FUTURE "url": response.get('content_uri'), + # FUTURE }) - else: - # Prepare our payload - payloads.append({ - "info": { - "mimetype": attachment.mimetype, - }, - "msgtype": "m.image", - "body": "tta.webp", - "url": response.get('content_uri'), - }) + # FUTURE else: + # FUTURE # Prepare our payload + # FUTURE payloads.append({ + # FUTURE "info": { + # FUTURE "mimetype": attachment.mimetype, + # FUTURE }, + # FUTURE "msgtype": "m.image", + # FUTURE "body": "tta.webp", + # FUTURE "url": response.get('content_uri'), + # FUTURE }) + + # Prepare our payload + payloads.append({ + "info": { + "mimetype": attachment.mimetype, + }, + "msgtype": "m.image", + "body": "tta.webp", + "url": response.get('content_uri'), + }) return payloads @@ -1131,11 +1141,12 @@ class NotifyMatrix(NotifyBase): or self.port == default_port else f':{self.port}') if path == '/upload': - if self.version == MatrixVersion.V3: - url += MATRIX_V3_MEDIA_PATH + path + # FUTURE if self.version == MatrixVersion.V3: + # FUTURE url += MATRIX_V3_MEDIA_PATH + path - else: - url += MATRIX_V2_MEDIA_PATH + path + # FUTURE else: + # FUTURE url += MATRIX_V2_MEDIA_PATH + path + url += MATRIX_V2_MEDIA_PATH + path params = {'filename': attachment.name} with open(attachment.path, 'rb') as fp: diff --git a/test/test_plugin_bulksms.py b/test/test_plugin_bulksms.py index 13b6323f..64669dae 100644 --- a/test/test_plugin_bulksms.py +++ b/test/test_plugin_bulksms.py @@ -162,7 +162,7 @@ def test_plugin_bulksms_edge_cases(mock_post): # Prepare Mock mock_post.return_value = response - # Test our markdown + # Instantiate our object obj = Apprise.instantiate( 'bulksms://{}:{}@{}?batch=n'.format(user, pwd, '/'.join(targets)))