Merge pull request #775 from Tenebriso/py3_merge_fix

rebase py3 onto develop and fix the merge conflicts

Author: Tenebriso

hubblestack/daemon.py

@@ -3,7 +3,6 @@
 Main entry point for the hubble daemon
 """
 
-
 # import lockfile
 import argparse
 import copy
@@ -513,7 +512,6 @@ def _setup_signaling():
         signal.signal(signal.SIGHUP, clean_up_process)
         signal.signal(signal.SIGQUIT, clean_up_process)
 
-
 def _disable_boto_modules():
     """ Disable the unneeded boto modules because they cause issues with the loader """
     # Disable all of salt's boto modules, they give nothing but trouble to the loader

hubblestack/extmods/grains/fqdn.py

@@ -75,6 +75,5 @@ def _find_addr(interfaces):
         for ip_addr in ips:
             if ip_addr != '127.0.0.1':
                 return {'local_ip4': ip_addr}
-
     # Give up
     return {'local_ip4', ''}

hubblestack/log.py

@@ -218,10 +218,10 @@ def _remove_sensitive_info(obj, patterns_to_filter):
     Filter known sensitive info
     """
     if isinstance(obj, dict):
-         obj = {
-             key: _remove_sensitive_info(value, patterns_to_filter)
-             for key, value in obj.items()
-             if not any(patt in key for patt in patterns_to_filter)}
+        obj = {
+            key: _remove_sensitive_info(value, patterns_to_filter)
+            for key, value in obj.items()
+            if not any(patt in key for patt in patterns_to_filter)}
     elif isinstance(obj, list):
         obj = [_remove_sensitive_info(item, patterns_to_filter)
                for item in obj]

hubblestack/status.py

@@ -90,6 +90,7 @@ def get_hubble_status_opt(name, require_type=None):
     return opts
 
 
+
 def get_hubble_or_salt_opt(name):
     """return the option specified by name found in __opts__ or __opts__['hubble'] """
     if name in __opts__:
@@ -254,7 +255,7 @@ def mark(self, timestamp=None):
                 timestamp = time.time()
                 self = self.get_bucket(timestamp)
             else:
-                if isinstance(timestamp, (str)):
+                if isinstance(timestamp, str):
                     timestamp = int(timestamp)
                 self = self.get_bucket(timestamp)
                 if timestamp < self.first_t:
@@ -412,9 +413,7 @@ def inner(*a, **kw):
                 ret = func(*a, **kw)
                 stat_handle.fin()
                 return ret
-
             return inner
-
         if invoke:
             return decorator(invoke)
         return decorator

tests/unittests/test_grep_nova.py

@@ -1,7 +1,4 @@
-import sys
 import os
-myPath = os.path.abspath(os.getcwd())
-sys.path.insert(0, myPath)
 import hubblestack.files.hubblestack_nova.grep
 
 

tests/unittests/test_nebula_osquery.py

@@ -1,11 +1,7 @@
-import sys
 import os
 import json
 import pytest
 
-myPath = os.path.abspath(os.getcwd())
-sys.path.insert(0, myPath)
-
 __salt__ = None
 
 def dump_var_file(var, name='var', dumpster='tests/unittests/output'):

tests/unittests/test_pkg_nova.py

@@ -1,7 +1,4 @@
-import sys
 import os
-myPath = os.path.abspath(os.getcwd())
-sys.path.insert(0, myPath)
 import hubblestack.files.hubblestack_nova.pkg
 
 

tests/unittests/test_process.py

@@ -1,13 +1,9 @@
 
 
 import os
-import sys
 import pytest
 from collections import defaultdict
 
-myPath = os.path.abspath(os.getcwd())
-sys.path.insert(0, myPath)
-
 from salt.exceptions import ArgumentValueError
 import hubblestack.extmods.fdg.process
 

tests/unittests/test_process_status.py

@@ -2,10 +2,6 @@
 
 import mock
 import os
-import sys
-
-myPath = os.path.abspath(os.getcwd())
-sys.path.insert(0, myPath)
 
 import hubblestack.extmods.fdg.process_status
 

tests/unittests/test_pulsar.py

@@ -1,7 +1,4 @@
-import sys
 import os
-myPath = os.path.abspath(os.getcwd())
-sys.path.insert(0, myPath)
 import hubblestack.extmods.modules.pulsar as pulsar
 from salt.exceptions import CommandExecutionError
 

tests/unittests/test_readfile.py

@@ -2,12 +2,9 @@
 
 import json
 import os
-import sys
 import yaml
 import pytest
 
-myPath = os.path.abspath(os.getcwd())
-sys.path.insert(0, myPath)
 import hubblestack.extmods.fdg.readfile
 
 

tests/unittests/test_ssl_certificate.py

@@ -1,10 +1,7 @@
 # coding: utf-8
-import sys
 import os
 import ssl
 import mock
-myPath = os.path.abspath(os.getcwd())
-sys.path.insert(0, myPath)
 import hubblestack.extmods.fdg.ssl_certificate
 
 

tests/unittests/test_stat_nova.py

@@ -1,7 +1,4 @@
-import sys
 import os
-myPath = os.path.abspath(os.getcwd())
-sys.path.insert(0, myPath)
 import hubblestack.files.hubblestack_nova.stat_nova
 
 

tests/unittests/test_time_sync.py

@@ -2,10 +2,6 @@
 
 import mock
 import os
-import sys
-
-myPath = os.path.abspath(os.getcwd())
-sys.path.insert(0, myPath)
 import hubblestack.extmods.fdg.time_sync
 
 class TestTimesync():