diff --git a/.travis.yml b/.travis.yml index 916effd..b282d6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ cache: python: - 2.6 - 2.7 - - 3.2 - 3.3 - 3.4 - 3.6 diff --git a/osquery/config_plugin.py b/osquery/config_plugin.py index 67e2e01..4d5b343 100644 --- a/osquery/config_plugin.py +++ b/osquery/config_plugin.py @@ -11,13 +11,13 @@ from __future__ import unicode_literals from abc import ABCMeta, abstractmethod +from future.utils import with_metaclass from osquery.extensions.ttypes import ExtensionResponse, ExtensionStatus from osquery.plugin import BasePlugin -class ConfigPlugin(BasePlugin): +class ConfigPlugin(with_metaclass(ABCMeta, BasePlugin)): """All config plugins should inherit from ConfigPlugin""" - __metaclass__ = ABCMeta def call(self, context): """Internal routing for this plugin type. diff --git a/osquery/logger_plugin.py b/osquery/logger_plugin.py index be19296..e577d6a 100644 --- a/osquery/logger_plugin.py +++ b/osquery/logger_plugin.py @@ -12,13 +12,14 @@ from __future__ import unicode_literals from abc import ABCMeta, abstractmethod +from future.utils import with_metaclass from osquery.extensions.ttypes import ExtensionResponse, ExtensionStatus from osquery.plugin import BasePlugin -class LoggerPlugin(BasePlugin): + +class LoggerPlugin(with_metaclass(ABCMeta, BasePlugin)): """All logger plugins should inherit from LoggerPlugin""" - __metaclass__ = ABCMeta _use_glog_message = "Use Glog for status logging" _invalid_action_message = "Not a valid logger plugin action" diff --git a/osquery/management.py b/osquery/management.py index a63fce3..b41625e 100644 --- a/osquery/management.py +++ b/osquery/management.py @@ -11,7 +11,6 @@ import argparse import logging import os -import shutil import socket import subprocess import sys @@ -98,7 +97,7 @@ def open(self, timeout=2, interval=0.01): try: self.connection.open() return - except: + except Exception: time.sleep(interval) delay += interval self.instance.kill() diff --git a/osquery/plugin.py b/osquery/plugin.py index fdc749e..8252020 100644 --- a/osquery/plugin.py +++ b/osquery/plugin.py @@ -11,12 +11,12 @@ from __future__ import unicode_literals from abc import ABCMeta, abstractmethod +from future.utils import with_metaclass from osquery.singleton import Singleton -class BasePlugin(Singleton): +class BasePlugin(with_metaclass(ABCMeta, Singleton)): """All osquery plugins should inherit from BasePlugin""" - __metaclass__ = ABCMeta @abstractmethod def call(self, context): diff --git a/osquery/table_plugin.py b/osquery/table_plugin.py index 74ec864..79b3d16 100644 --- a/osquery/table_plugin.py +++ b/osquery/table_plugin.py @@ -13,15 +13,15 @@ from abc import ABCMeta, abstractmethod from builtins import str from collections import namedtuple +from future.utils import with_metaclass import json import logging from osquery.extensions.ttypes import ExtensionResponse, ExtensionStatus from osquery.plugin import BasePlugin -class TablePlugin(BasePlugin): +class TablePlugin(with_metaclass(ABCMeta, BasePlugin)): """All table plugins should inherit from TablePlugin""" - __metaclass__ = ABCMeta _no_action_message = "Table plugins must include a request action" diff --git a/setup.py b/setup.py index 8bbf54d..17fdd22 100755 --- a/setup.py +++ b/setup.py @@ -109,7 +109,6 @@ def run(self): "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.6",