From ef44905b3d30a1c274e8c38574960cd88ec92a49 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Thu, 25 Mar 2021 12:20:29 -0700 Subject: [PATCH] Get rid of strip_self It does the same thing as Python's staticmethod, so just use that instead. Change-Id: Ib1974a6d315383583c36c440a503b39679c01443 --- swift/obj/diskfile.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/swift/obj/diskfile.py b/swift/obj/diskfile.py index d738b66ce0..b119831521 100644 --- a/swift/obj/diskfile.py +++ b/swift/obj/diskfile.py @@ -647,15 +647,6 @@ def clear_auditor_status(devices, datadir, auditor_type="ALL"): remove_file(auditor_status) -def strip_self(f): - """ - Wrapper to attach module level functions to base class. - """ - def wrapper(self, *args, **kwargs): - return f(*args, **kwargs) - return wrapper - - class DiskFileRouter(object): def __init__(self, *args, **kwargs): @@ -695,9 +686,9 @@ class BaseDiskFileManager(object): diskfile_cls = None # must be set by subclasses policy = None # must be set by subclasses - invalidate_hash = strip_self(invalidate_hash) - consolidate_hashes = strip_self(consolidate_hashes) - quarantine_renamer = strip_self(quarantine_renamer) + invalidate_hash = staticmethod(invalidate_hash) + consolidate_hashes = staticmethod(consolidate_hashes) + quarantine_renamer = staticmethod(quarantine_renamer) def __init__(self, conf, logger): self.logger = logger