Remove explicit inheritance from object (kevoreilly#837)

admin/admin.py

@@ -125,7 +125,7 @@ def file_recon(file: str, yara_category: str = "CAPE"):
         TARGET = os.path.join(CAPE_PATH, "analyzer", "windows", "modules", "packages", filename)
     elif b"def choose_package(file_type, file_name, exports, target)" in f:
         TARGET = os.path.join(CAPE_PATH, "analyzer", "windows", "lib", "core", filename)
-    elif b"class Signature(object):" in f and b"class Processing(object):" in f:
+    elif b"class Signature:" in f and b"class Processing:" in f:
         TARGET = os.path.join(CAPE_PATH, "lib", "cuckoo", "common", filename)
     elif b"class Analyzer:" in f and b"class PipeHandler(Thread):" in f and b"class PipeServer(Thread):" in f:
         TARGET = os.path.join(CAPE_PATH, "analyzer", "windows", filename)

agent/agent.py

@@ -91,7 +91,7 @@ def do_POST(self):
         self.httpd.handle(self)
 
 
-class MiniHTTPServer(object):
+class MiniHTTPServer:
     def __init__(self):
         self.handler = MiniHTTPRequestHandler
 
@@ -146,7 +146,7 @@ def shutdown(self):
         self.s._BaseServer__shutdown_request = True
 
 
-class jsonify(object):
+class jsonify:
     """Wrapper that represents Flask.jsonify functionality."""
 
     def __init__(self, **kwargs):
@@ -163,7 +163,7 @@ def headers(self, obj):
         pass
 
 
-class send_file(object):
+class send_file:
     """Wrapper that represents Flask.send_file functionality."""
 
     def __init__(self, path):
@@ -191,7 +191,7 @@ def headers(self, obj):
         obj.send_header("Content-Length", self.length)
 
 
-class request(object):
+class request:
     form = {}
     files = {}
     client_ip = None

analyzer/linux/lib/common/abstracts.py

@@ -8,7 +8,7 @@
 from lib.common.exceptions import CuckooPackageError
 
 
-class Package(object):
+class Package:
     """Base abstract analysis package."""
 
     PATHS = []
@@ -69,7 +69,7 @@ def get_pids(self):
         return []
 
 
-class Auxiliary(object):
+class Auxiliary:
     priority = 0
 
     def __init__(self, options={}, analyzer=None):

analyzer/linux/lib/common/results.py

@@ -38,7 +38,7 @@ def upload_to_host(file_path, dump_path, pids=[], metadata="", category=""):
             nc.close()
 
 
-class NetlogConnection(object):
+class NetlogConnection:
     def __init__(self, proto=""):
         config = Config(cfg="analysis.conf")
         self.hostip, self.hostport = config.ip, config.port

analyzer/linux/lib/core/packages.py

@@ -76,7 +76,7 @@ def _guess_package_name(file_type, file_name):
         return None
 
 
-class Package(object):
+class Package:
     """Base analysis package"""
 
     def __init__(self, target, **kwargs):

analyzer/windows/analyzer.py

@@ -691,7 +691,7 @@ def run(self):
         return True
 
 
-class Files(object):
+class Files:
     PROTECTED_NAMES = [
         "vmwareuser.exe",
         "vmwareservice.exe",
@@ -810,7 +810,7 @@ def dump_files(self):
             self.delete_file(list(self.files.keys())[0])
 
 
-class ProcessList(object):
+class ProcessList:
     def __init__(self):
         self.pids = []
         self.pids_notrack = []
@@ -855,7 +855,7 @@ def remove_pid(self, pid):
             self.pids_notrack.remove(pid)
 
 
-class CommandPipeHandler(object):
+class CommandPipeHandler:
     """Pipe Handler.
     This class handles the notifications received through the Pipe Server and
     decides what to do with them.

analyzer/windows/lib/common/abstracts.py

@@ -17,7 +17,7 @@
 log = logging.getLogger(__name__)
 
 
-class Package(object):
+class Package:
     """Base abstract analysis package."""
 
     PATHS = []
@@ -179,7 +179,7 @@ def move_curdir(self, filepath):
         return newpath
 
 
-class Auxiliary(object):
+class Auxiliary:
     def __init__(self, options=None, config=None):
         """@param options: options dict."""
         if options is None:

analyzer/windows/lib/common/results.py

@@ -45,7 +45,7 @@ def upload_to_host(file_path, dump_path, pids="", ppids="", metadata="", categor
             nc.close()
 
 
-class NetlogConnection(object):
+class NetlogConnection:
     def __init__(self, proto=""):
         self.hostip, self.hostport = config.ip, config.port
         self.sock = None

analyzer/windows/lib/core/log.py

@@ -102,7 +102,7 @@ def run(self):
             return True
 
 
-class LogServer(object):
+class LogServer:
     def __init__(self, result_ip, result_port, logserver_path):
         # Create the Named Pipe.
         sd = SECURITY_DESCRIPTOR()

docs/book/src/customization/packages.rst

@@ -39,7 +39,7 @@ Package object:
         from lib.api.process import Process
         from lib.common.exceptions import CuckooPackageError
 
-        class Package(object):
+        class Package:
             def start(self):
                 raise NotImplementedError
 

lib/cuckoo/common/abstracts.py

@@ -89,7 +89,7 @@
 myresolver.nameserver = ["8.8.8.8"]
 
 
-class Auxiliary(object):
+class Auxiliary:
     """Base abstract class for auxiliary modules."""
 
     def __init__(self):
@@ -114,7 +114,7 @@ def stop(self):
         raise NotImplementedError
 
 
-class Machinery(object):
+class Machinery:
     """Base abstract class for machinery modules."""
 
     # Default label used in machinery configuration file to supply virtual
@@ -646,7 +646,7 @@ def _extract_creation_time(node):
         return snapshot
 
 
-class Processing(object):
+class Processing:
     """Base abstract class for processing module."""
 
     order = 1
@@ -713,7 +713,7 @@ def run(self):
         raise NotImplementedError
 
 
-class Signature(object):
+class Signature:
     """Base class for Cuckoo signatures."""
 
     name = ""
@@ -1564,7 +1564,7 @@ def as_result(self):
         )
 
 
-class Report(object):
+class Report:
     """Base abstract class for reporting module."""
 
     order = 1
@@ -1621,7 +1621,7 @@ def run(self):
         raise NotImplementedError
 
 
-class Feed(object):
+class Feed:
     """Base abstract class for feeds."""
 
     name = ""
@@ -1692,7 +1692,7 @@ def run(self, modified=False):
         return
 
 
-class ProtocolHandler(object):
+class ProtocolHandler:
     """Abstract class for protocol handlers coming out of the analysis."""
 
     def __init__(self, task_id, ctx, version=None):

lib/cuckoo/common/aplib.py

@@ -14,7 +14,7 @@
 __author__ = "Sandor Nemes"
 
 
-class APLib(object):
+class APLib:
 
     __slots__ = "source", "destination", "tag", "bitcount", "strict"
 

lib/cuckoo/common/files.py

@@ -43,7 +43,7 @@ def open_exclusive(path, mode="xb", bufsize=-1):
         raise
 
 
-class Storage(object):
+class Storage:
     @staticmethod
     def get_filename_from_path(path):
         """Cross-platform filename extraction from path.

lib/cuckoo/common/icon.py

@@ -58,7 +58,7 @@ class ICONDIRENTRY(Structure):
     ]
 
 
-class PEGroupIconDir(object):
+class PEGroupIconDir:
     def __init__(self, data):
         self.data = data
         self.icondir = None

lib/cuckoo/common/integrations/parse_dotnet.py

@@ -14,7 +14,7 @@
 # Note universal_newlines should be False as some binaries fails to convert bytes to text
 
 
-class DotNETExecutable(object):
+class DotNETExecutable:
     """.NET analysis"""
 
     def __init__(self, file_path):

lib/cuckoo/common/integrations/parse_elf.py

@@ -36,7 +36,7 @@
     ELFFile = False
 
 
-class ELF(object):
+class ELF:
     def __init__(self, file_path):
         self.file_path = file_path
         self.elf = None

lib/cuckoo/common/integrations/parse_encoded_script.py

@@ -11,7 +11,7 @@
 
 
 # TODO: this probably can be replaced by vbe_decoder
-class EncodedScriptFile(object):
+class EncodedScriptFile:
     """Deobfuscates and interprets Windows Script Files."""
 
     encoding = (

lib/cuckoo/common/integrations/parse_hwp.py

@@ -18,7 +18,7 @@
 log = logging.getLogger(__name__)
 
 
-class HwpDocument(object):
+class HwpDocument:
     """Static analysis of HWP documents."""
 
     def __init__(self, filepath: str):

lib/cuckoo/common/integrations/parse_java.py

@@ -13,7 +13,7 @@
 log = logging.getLogger(__name__)
 
 
-class Java(object):
+class Java:
     """Java Static Analysis"""
 
     def __init__(self, file_path: str, decomp_jar: str):

lib/cuckoo/common/integrations/parse_lnk.py

@@ -12,7 +12,7 @@
 log = logging.getLogger(__name__)
 
 
-class LnkShortcut(object):
+class LnkShortcut:
     signature = [0x4C, 0x00, 0x00, 0x00]
     guid = [
         0x01,

lib/cuckoo/common/integrations/parse_office.py

@@ -55,7 +55,7 @@
 log = logging.getLogger(__name__)
 
 
-class Office(object):
+class Office:
     """Office Document Static Analysis
     Supported formats:
     - Word 97-2003 (.doc, .dot), Word 2007+ (.docm, .dotm)

lib/cuckoo/common/integrations/parse_pdf.py

@@ -13,7 +13,7 @@
 log = logging.getLogger(__name__)
 
 
-class PDF(object):
+class PDF:
     """PDF Analysis."""
 
     def __init__(self, file_path: str):

lib/cuckoo/common/integrations/parse_pe.py

@@ -146,7 +146,7 @@ def IsPEImage(buf: bytes, size: int = False) -> bool:
     return True
 
 
-class PortableExecutable(object):
+class PortableExecutable:
     """PE analysis."""
 
     def __init__(self, file_path: str):

lib/cuckoo/common/integrations/parse_url.py

@@ -32,7 +32,7 @@
 log = logging.getLogger(__name__)
 
 
-class URL(object):
+class URL:
     """URL 'Static' Analysis"""
 
     def __init__(self, url: str):

lib/cuckoo/common/integrations/parse_wsf.py

@@ -19,7 +19,7 @@
     HAVE_BS4 = False
 
 
-class WindowsScriptFile(object):
+class WindowsScriptFile:
     script_re = "<\\s*script\\s*.*>.*?<\\s*/\\s*script\\s*>"
 
     def __init__(self, filepath):

lib/cuckoo/common/irc.py

@@ -19,7 +19,7 @@
 log = logging.getLogger("Processing.Pcap.irc.protocol")
 
 
-class ircMessage(object):
+class ircMessage:
     """IRC Protocol Request."""
 
     # Client commands

lib/cuckoo/common/netlog.py

@@ -88,7 +88,7 @@ def check_names_for_typeinfo(arginfo):
     return argnames, converters
 
 
-class BsonParser(object):
+class BsonParser:
     """Interprets .bson logs from the monitor.
     The monitor provides us with "info" messages that explain how the function
     arguments will come through later on. This class remembers these info

lib/cuckoo/common/objects.py

@@ -154,7 +154,7 @@ def __init__(self, url):
         self.url = url
 
 
-class File(object):
+class File:
     """Basic file object class with all useful utilities."""
 
     # The yara rules should not change during one Cuckoo run and as such we're
@@ -575,7 +575,7 @@ class Static(File):
     pass
 
 
-class ProcDump(object):
+class ProcDump:
     def __init__(self, dump_file, pretty=False):
         self._dumpfile = open(dump_file, "rb")
         self.dumpfile = mmap.mmap(self._dumpfile.fileno(), 0, access=mmap.ACCESS_READ)

lib/cuckoo/common/pdftools/pdf-parser.py

@@ -1095,7 +1095,7 @@ def RunLengthDecode(data):
 # and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 
-class LZWDecoder(object):
+class LZWDecoder:
     def __init__(self, fp):
         self.fp = fp
         self.buff = 0

lib/cuckoo/common/utils.py

@@ -871,7 +871,7 @@ def inner(self, *args, **kwargs):
     return inner
 
 
-class SuperLock(object):
+class SuperLock:
     def __init__(self):
         self.tlock = threading.Lock()
         self.mlock = multiprocessing.Lock()