HenriWahl#787 LooseVersion replacement

RincewindsHat · Feb 19, 2022 · e670b25 · e670b25
1 parent 46f1099
commit e670b25
Show file tree

Hide file tree

Showing 32 changed files with 42 additions and 37 deletions.
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1 +1 @@
-Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
diff --git a/Nagstamon/Config.py b/Nagstamon/Config.py
@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -125,9 +125,9 @@ class AppInfo(object):
         contains app information previously located in GUI.py
     """
     NAME = 'Nagstamon'
-    VERSION = '3.9-20211208'
+    VERSION = '3.9-20220219'
     WEBSITE = 'https://nagstamon.de'
-    COPYRIGHT = '©2008-2021 Henri Wahl et al.'
+    COPYRIGHT = '©2008-2022 Henri Wahl et al.'
     COMMENTS = 'Nagios status monitor for your desktop'
     # dict of servers to offer for downloads if an update is available
     DOWNLOAD_SERVERS = {'nagstamon.de': 'https://github.com/HenriWahl/Nagstamon/releases'}

diff --git a/Nagstamon/Helpers.py b/Nagstamon/Helpers.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Objects.py b/Nagstamon/Objects.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/QUI/__init__.py b/Nagstamon/QUI/__init__.py
@@ -1,6 +1,6 @@
 # encoding: utf-8
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/QUI/dialog_about.py b/Nagstamon/QUI/dialog_about.py
@@ -87,7 +87,7 @@ def retranslateUi(self, dialog_about):
         dialog_about.setWindowTitle(_translate("dialog_about", "About Nagstamon"))
         self.label_nagstamon.setText(_translate("dialog_about", "Nagstamon x"))
         self.label_nagstamon_long.setText(_translate("dialog_about", "Nagios status monitor"))
-        self.label_copyright.setText(_translate("dialog_about", "©2008-2021 Henri Wahl et al."))
+        self.label_copyright.setText(_translate("dialog_about", "©2008-2022 Henri Wahl et al."))
         self.label_website.setText(_translate("dialog_about", "https://nagstamon.de"))
         self.label_footnote.setText(_translate("dialog_about", "Footnote"))
         self.tabs.setTabText(self.tabs.indexOf(self.tab_about), _translate("dialog_about", "About"))

diff --git a/Nagstamon/QUI/dialog_about.ui b/Nagstamon/QUI/dialog_about.ui
@@ -75,7 +75,7 @@
        <item>
         <widget class="QLabel" name="label_copyright">
          <property name="text">
-          <string>©2008-2021 Henri Wahl et al.</string>
+          <string>©2008-2022 Henri Wahl et al.</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>

diff --git a/Nagstamon/Servers/Alertmanager/LICENSE b/Nagstamon/Servers/Alertmanager/LICENSE
@@ -1,5 +1,5 @@
 Nagstamon - Nagios status monitor for your desktop
-Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/Centreon.py b/Nagstamon/Servers/Centreon.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/Generic.py b/Nagstamon/Servers/Generic.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/Icinga.py b/Nagstamon/Servers/Icinga.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 import json
 from bs4 import BeautifulSoup
 from collections import OrderedDict
-from distutils.version import LooseVersion
 
 from Nagstamon.Servers.Generic import GenericServer
 from Nagstamon.Objects import (GenericHost, GenericService, Result)
@@ -89,6 +88,13 @@ def get_server_version(self):
         else:
             self.refresh_authentication = True
 
+    def looseversion(self, version):
+        """
+           Replacement for distutils.version.LooseVersion which got lost in newer Python
+           Fix for https://github.com/HenriWahl/Nagstamon/issues/787
+        """
+        # gives back a list with split version components - makes 2 method calls comparable
+        return [int(x) for x in version.split('.')]
 
     def _get_status(self):
         """
@@ -102,7 +108,7 @@ def _get_status(self):
             if self.version != '':
                 # define CGI URLs for hosts and services depending on JSON-capable server version
                 if self.cgiurl_hosts == self.cgiurl_services == None:
-                    if LooseVersion(self.version) < LooseVersion('1.7'):
+                    if self.looseversion(self.version) < self.looseversion('1.7'):
                         # http://www.nagios-wiki.de/nagios/tips/host-_und_serviceproperties_fuer_status.cgi?s=servicestatustypes
                         # services (unknown, warning or critical?) as dictionary, sorted by hard and soft state type
                         self.cgiurl_services = {'hard': self.monitor_cgi_url + '/status.cgi?host=all&servicestatustypes=253&serviceprops=262144', \
@@ -680,5 +686,4 @@ def _set_acknowledge(self, host, service, author, comment, sticky, notify, persi
                 cgi_data['service'] = s
                 self.FetchURL(url, giveback='raw', cgi_data=cgi_data)
 
-0
 
diff --git a/Nagstamon/Servers/Icinga2API.py b/Nagstamon/Servers/Icinga2API.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/IcingaWeb2.py b/Nagstamon/Servers/IcingaWeb2.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/Livestatus.py b/Nagstamon/Servers/Livestatus.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/Monitos3.py b/Nagstamon/Servers/Monitos3.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/Monitos4x.py b/Nagstamon/Servers/Monitos4x.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/Multisite.py b/Nagstamon/Servers/Multisite.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/Nagios.py b/Nagstamon/Servers/Nagios.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/Opsview.py b/Nagstamon/Servers/Opsview.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # Based on https://github.com/duncs/Nagstamon by @duncs
 #

diff --git a/Nagstamon/Servers/Prometheus.py b/Nagstamon/Servers/Prometheus.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/SnagView3.py b/Nagstamon/Servers/SnagView3.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/Thruk.py b/Nagstamon/Servers/Thruk.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 # Thruk additions copyright by dcec@Github
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/Nagstamon/Servers/__init__.py b/Nagstamon/Servers/__init__.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/Servers/op5Monitor.py b/Nagstamon/Servers/op5Monitor.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/__init__.py b/Nagstamon/__init__.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/setup.py b/Nagstamon/setup.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Nagstamon/thirdparty/__init__.py b/Nagstamon/thirdparty/__init__.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/build/build.py b/build/build.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/build/debian/changelog b/build/debian/changelog
@@ -1,4 +1,4 @@
-nagstamon (3.9-20211208) unstable; urgency=low
+nagstamon (3.9-20220219) unstable; urgency=low
   * New upstream
 
  -- Henri Wahl <henri@nagstamon.de> Wed, 08 Dec 2021 08:00:00 +0100

diff --git a/nagstacli.py b/nagstacli.py
@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al. Maik Lüdeke <m.luedeke@ifw-dresden.de>
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al. Maik Lüdeke <m.luedeke@ifw-dresden.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/nagstamon.py b/nagstamon.py
@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 # Nagstamon - Nagios status monitor for your desktop
-# Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
+# Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Copyright (C) 2008-2021 Henri Wahl <henri@nagstamon.de> et al.
		Copyright (C) 2008-2022 Henri Wahl <henri@nagstamon.de> et al.