Merge branch 'py3' of https://github.com/hubblestack/hubble into python3

Author: Tenebriso

hubblestack/extmods/modules/nova_loader.py

@@ -119,9 +119,9 @@ def __bool__(self):
         # we are zero if dict is empty and loaded is true
         return bool(self._dict or not self.loaded)
 
-    def __bool__(self):
+    def __nonzero__(self):
         # we are zero if dict is empty and loaded is true
-        return self.__nonzero__()
+        return self.__bool__()
 
     def clear(self):
         """

hubblestack/files/hubblestack_nova/grep.py

@@ -175,7 +175,7 @@ def audit(data_list, tags, labels, debug=False, **kwargs):
                 if not os.path.exists(name) and 'match_on_file_missing' in tag_data:
                     if tag_data['match_on_file_missing']:
                         found = True
-                        failure_reason = "Found the file '{0}'. This blaclisted file " \
+                        failure_reason = "Found the file '{0}'. This blacklisted file " \
                                          "should not exist.".format(name)
                     else:
                         found = False

requirements.txt

@@ -1,4 +1,5 @@
 ntplib
+distro
 pyinstaller==3.3.1
 Crypto
 pyopenssl>=16.2.0

setup.py

@@ -1,12 +1,13 @@
 from setuptools import setup, find_packages
-import platform
 import re
 
-distro, version, _ = platform.dist()
-if not distro:
-    distro, version, _ = platform.linux_distribution(supported_dists=['system'])
+try:
+    import distro
+    distro, version, _ = distro.linux_distribution(full_distribution_name=False)
+except ModuleNotFoundError:
+    distro = version = ''
 
-# Default to cent7
+# Default to CentOS7
 data_files = [('/usr/lib/systemd/system', ['pkg/source/hubble.service']),
               ('/etc/hubble', ['conf/hubble']), ]