Test Coverage and Code Tidy (#1015)

caronc · Dec 17, 2023 · cda6925 · cda6925
1 parent a175f16
commit cda6925
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 31 deletions.
diff --git 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
@@ -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
@@ -617,7 +617,7 @@ def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
         # 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
@@ -248,7 +248,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         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
@@ -727,28 +727,38 @@ def _send_attachments(self, attach):
             #     "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'),
-                })
-
-            else:
-                # Prepare our payload
-                payloads.append({
-                    "info": {
-                        "mimetype": attachment.mimetype,
-                    },
-                    "msgtype": "m.image",
-                    "body": "tta.webp",
-                    "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     })
+
+            # 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 @@ def _fetch(self, path, payload=None, params=None, attachment=None,
                 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
@@ -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)))