From 5f0cb289c1d91513427ffdc8f646bc86516c2759 Mon Sep 17 00:00:00 2001
From: nico <nico@magicbroccoli.de>
Date: Mon, 29 Jun 2020 11:03:49 +0200
Subject: black reformat

* black reformatted the code
---
 api.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'api.py')

diff --git a/api.py b/api.py
index b14fa52..3372976 100644
--- a/api.py
+++ b/api.py
@@ -9,6 +9,7 @@ class EjabberdApi:
     """
     class to interact with the ejabberd rest/ xmlrpc api
     """
+
     def __init__(self, url, login=None, api: str = "rpc"):
         # api variables
         self._login = login
@@ -25,7 +26,7 @@ class EjabberdApi:
     @property
     def _auth(self) -> (str, None):
         if self._login is not None:
-            return f"{self._login['user']}@{self._login['server']}", self._login['password']
+            return f"{self._login['user']}@{self._login['server']}", self._login["password"]
         return None
 
     def _rest(self, command: str, data) -> dict:
@@ -34,7 +35,7 @@ class EjabberdApi:
             self.session.auth = self._auth
 
         # post
-        r = self.session.post('/'.join([self._url, command]), json=data)
+        r = self.session.post("/".join([self._url, command]), json=data)
 
         # proceed if response is ok
         if r.ok:
-- 
cgit v1.2.3-54-g00ecf


From 044e0334d2bfb9c4b076afc562e4fb3d17c7db20 Mon Sep 17 00:00:00 2001
From: nico <nico@magicbroccoli.de>
Date: Mon, 29 Jun 2020 18:59:16 +0200
Subject: flake8 fixup

* fix trailing/ leading whitespaces
* fix None comparison to use is
+ add noqa ignore statements for the influx escape replacements
+ add noqa ignore statements around the bare excepts

TODO: This is only a temporary fix for most of the bare excepts, we need further specify those.
---
 README.md     | 6 +++---
 api.py        | 2 +-
 cleanup.py    | 6 +++---
 influx.py     | 4 ++--
 prometheus.py | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'api.py')

diff --git a/README.md b/README.md
index 7cbd2cf..ac33b00 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ listen:
 
 acl:
   api:
-    user: 
+    user:
       - "api_user@magicbroccoli.de"
   loopback:
     ip:
@@ -59,7 +59,7 @@ acl:
 api_permissions:
   "api access":
     from:
-      - mod_http_api 
+      - mod_http_api
     who:
       access:
         allow:
@@ -81,7 +81,7 @@ configuration file should be located at `/etc/ejabberd-metrics.yml`.
 #### systemd service
 To properly operate the metrics exporter tools, we created some systemd service templates, to simplify the whole
 process. If the `ejabberd-metrics.yml` file is not accessible for the user`nobody:nogroup`, it is required to update the
-`User` and `Group` definitions inside the service file. 
+`User` and `Group` definitions inside the service file.
 If a virtualenv is used, it is required to update the `Environment=PATH` to include the `venv/bin` directory created
 earlier.
 
diff --git a/api.py b/api.py
index 3372976..6b83d2b 100644
--- a/api.py
+++ b/api.py
@@ -53,6 +53,6 @@ class EjabberdApi:
                     return fn(self._login, data)
                 return fn(data)
 
-            except:
+            except:  # noqa: E722
                 # this needs to be more specific
                 return {}
diff --git a/cleanup.py b/cleanup.py
index ee9def1..671c466 100755
--- a/cleanup.py
+++ b/cleanup.py
@@ -38,13 +38,13 @@ class EjabberdCleanup(EjabberdApiCalls):
             lastdate = None
             try:
                 lastdate = datetime.datetime.strptime(last_stamp, "%Y-%m-%dT%H:%M:%SZ")
-            except:
+            except:  # noqa: E722
                 try:
                     lastdate = datetime.datetime.strptime(last_stamp, "%Y-%m-%dT%H:%M:%S.%fZ")
-                except:
+                except:  # noqa: E722
                     logging.error(f"{user}@{host}: not able to parse '{last_stamp}'")
                     return
-            if lastdate != None and lastdate - datetime.datetime.now() > datetime.timedelta(
+            if lastdate is not None and lastdate - datetime.datetime.now() > datetime.timedelta(
                 days=self.offline_since_days
             ):
                 self.delete_user(host, user, f"last seen @ {lastdate}")
diff --git a/influx.py b/influx.py
index b51d8f5..9437831 100644
--- a/influx.py
+++ b/influx.py
@@ -21,8 +21,8 @@ class Influx:
     @staticmethod
     def _rmspace(key: str = None, value: (str, int) = None):
         try:
-            key = key.replace(" ", "\ ")
-            value = value.replace(" ", "\ ")
+            key = key.replace(" ", "\ ")  # noqa: W605
+            value = value.replace(" ", "\ ")  # noqa: W605
         except (TypeError, AttributeError):
             pass
 
diff --git a/prometheus.py b/prometheus.py
index 6d7bbe5..a526851 100755
--- a/prometheus.py
+++ b/prometheus.py
@@ -23,7 +23,7 @@ class DynamicMetricsHandler(BaseHTTPRequestHandler):
             registry = registry.restricted_registry(params["name[]"])
         try:
             output = generate_latest(registry)
-        except:
+        except:  # noqa: E722
             self.send_error(500, "error generating metric output")
             raise
         self.send_response(200)
-- 
cgit v1.2.3-54-g00ecf