Merge pull request #311 from Backblaze/remove-inheritance-from-object

ppolewicz · web-flow · commit 9a3f9ce1bcbd · 2022-04-05T23:24:59.000+02:00
Remove inheritance from object (leftover from python2)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Don't run coverage in pypy in CI
 * Introduce a common thread worker pool for all downloads
 * Increase http timeout to 20min (for copy using 5GB parts)
+* Remove inheritance from object (leftover from python2)
 
 ### Added
 * Add pypy-3.8 to test matrix
diff --git a/b2sdk/__init__.py b/b2sdk/__init__.py
@@ -14,7 +14,7 @@
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
 
-class UrllibWarningFilter(object):
+class UrllibWarningFilter:
     def filter(self, record):
         return record.msg != "Connection pool is full, discarding connection: %s"
 
diff --git a/b2sdk/account_info/upload_url_pool.py b/b2sdk/account_info/upload_url_pool.py
@@ -15,7 +15,7 @@
 from .abstract import AbstractAccountInfo
 
 
-class UploadUrlPool(object):
+class UploadUrlPool:
     """
     For each key (either a bucket id or large file id), hold a pool
     of (url, auth_token) pairs.
diff --git a/b2sdk/api.py b/b2sdk/api.py
@@ -48,7 +48,7 @@ def url_for_api(info, api_name):
     return '%s/b2api/%s/%s' % (base, API_VERSION, api_name)
 
 
-class Services(object):
+class Services:
     """ Gathers objects that provide high level logic over raw api usage. """
     UPLOAD_MANAGER_CLASS = staticmethod(UploadManager)
     COPY_MANAGER_CLASS = staticmethod(CopyManager)
diff --git a/b2sdk/b2http.py b/b2sdk/b2http.py
@@ -43,7 +43,7 @@ def _print_exception(e, indent=''):
             _print_exception(a, indent + '        ')
 
 
-class ResponseContextManager(object):
+class ResponseContextManager:
     """
     A context manager that closes a requests.Response when done.
     """
@@ -58,7 +58,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         self.response.close()
 
 
-class HttpCallback(object):
+class HttpCallback:
     """
     A callback object that does nothing.  Overrides pre_request
     and/or post_request as desired.
@@ -128,7 +128,7 @@ def post_request(self, method, url, headers, response):
             raise ClockSkew(skew_seconds)
 
 
-class B2Http(object):
+class B2Http:
     """
     A wrapper for the requests module.  Provides the operations
     needed to access B2, and handles retrying when the returned
diff --git a/b2sdk/bounded_queue_executor.py b/b2sdk/bounded_queue_executor.py
@@ -11,7 +11,7 @@
 import threading
 
 
-class BoundedQueueExecutor(object):
+class BoundedQueueExecutor:
     """
     Wrap a concurrent.futures.Executor and limits the number of requests that
     can be queued at once.  Requests to submit() tasks block until
diff --git a/b2sdk/bucket.py b/b2sdk/bucket.py
@@ -943,7 +943,7 @@ def __repr__(self):
         return 'Bucket<%s,%s,%s>' % (self.id_, self.name, self.type_)
 
 
-class BucketFactory(object):
+class BucketFactory:
     """
     This is a factory for creating bucket objects from different kind of objects.
     """
diff --git a/b2sdk/file_version.py b/b2sdk/file_version.py
@@ -348,7 +348,7 @@ def _get_args_for_clone(self):
         return args
 
 
-class FileVersionFactory(object):
+class FileVersionFactory:
     """
     Construct :py:class:`b2sdk.v2.FileVersion` objects from api responses.
     """
@@ -430,7 +430,7 @@ def from_api_response(self, file_version_dict, force_action=None):
         )
 
 
-class DownloadVersionFactory(object):
+class DownloadVersionFactory:
     """
     Construct :py:class:`b2sdk.v2.DownloadVersion` objects from download headers.
     """
@@ -487,7 +487,7 @@ def from_response_headers(self, headers):
         )
 
 
-class FileIdAndName(object):
+class FileIdAndName:
     """
     A structure which represents a B2 cloud file with just `file_name` and `fileId` attributes.
 
diff --git a/b2sdk/large_file/part.py b/b2sdk/large_file/part.py
@@ -9,7 +9,7 @@
 ######################################################################
 
 
-class PartFactory(object):
+class PartFactory:
     @classmethod
     def from_list_parts_dict(cls, part_dict):
         return Part(
@@ -20,7 +20,7 @@ def from_list_parts_dict(cls, part_dict):
         )
 
 
-class Part(object):
+class Part:
     """
     A structure which represents a *part* of a large file upload.
 
diff --git a/b2sdk/large_file/services.py b/b2sdk/large_file/services.py
@@ -17,7 +17,7 @@
 from b2sdk.large_file.unfinished_large_file import UnfinishedLargeFile
 
 
-class LargeFileServices(object):
+class LargeFileServices:
     def __init__(self, services):
         self.services = services
 
diff --git a/b2sdk/large_file/unfinished_large_file.py b/b2sdk/large_file/unfinished_large_file.py
@@ -12,7 +12,7 @@
 from b2sdk.file_lock import FileRetentionSetting, LegalHold
 
 
-class UnfinishedLargeFile(object):
+class UnfinishedLargeFile:
     """
     A structure which represents a version of a file (in B2 cloud).
 
diff --git a/b2sdk/raw_simulator.py b/b2sdk/raw_simulator.py
@@ -69,7 +69,7 @@ def get_bytes_range(data_bytes, bytes_range):
     return data_bytes[bytes_range[0]:bytes_range[1] + 1]
 
 
-class KeySimulator(object):
+class KeySimulator:
     """
     Hold information about one application key, which can be either
     a master application key, or one created with create_key().
@@ -121,7 +121,7 @@ def get_allowed(self):
         )
 
 
-class PartSimulator(object):
+class PartSimulator:
     def __init__(self, file_id, part_number, content_length, content_sha1, part_data):
         self.file_id = file_id
         self.part_number = part_number
@@ -138,7 +138,7 @@ def as_list_parts_dict(self):
         )  # yapf: disable
 
 
-class FileSimulator(object):
+class FileSimulator:
     """
     One of three: an unfinished large file, a finished file, or a deletion marker.
     """
@@ -439,7 +439,7 @@ def _get_encryption_mode_and_secret(self, encryption: Optional[EncryptionSetting
 FakeRequest = collections.namedtuple('FakeRequest', 'url headers')
 
 
-class FakeResponse(object):
+class FakeResponse:
     def __init__(self, account_auth_token_or_none, file_sim, url, range_=None):
         self.data_bytes = file_sim.data_bytes
         self.headers = file_sim.as_download_headers(account_auth_token_or_none, range_)
@@ -467,7 +467,7 @@ def close(self):
         pass
 
 
-class BucketSimulator(object):
+class BucketSimulator:
 
     # File IDs start at 9999 and count down, so they sort in the order
     # returned by list_file_versions. The IDs are strings.
diff --git a/b2sdk/session.py b/b2sdk/session.py
@@ -35,7 +35,7 @@ class TokenType(Enum):
     UPLOAD_SMALL = 'upload_small'
 
 
-class B2Session(object):
+class B2Session:
     """
         A facade that supplies the correct api_url and account_auth_token
         to methods of underlying raw_api and reauthorizes if necessary.
diff --git a/b2sdk/stream/base.py b/b2sdk/stream/base.py
@@ -11,7 +11,7 @@
 import io
 
 
-class ReadOnlyStreamMixin(object):
+class ReadOnlyStreamMixin:
     def writeable(self):
         return False
 
diff --git a/b2sdk/sync/policy_manager.py b/b2sdk/sync/policy_manager.py
@@ -14,7 +14,7 @@
 from .path import AbstractSyncPath
 
 
-class SyncPolicyManager(object):
+class SyncPolicyManager:
     """
     Policy manager; implement a logic to get a correct policy class
     and create a policy object based on various parameters.
diff --git a/b2sdk/sync/scan_policies.py b/b2sdk/sync/scan_policies.py
@@ -24,7 +24,7 @@
     regex_class = re._pattern_type
 
 
-class RegexSet(object):
+class RegexSet:
     """
     Hold a (possibly empty) set of regular expressions and know how to check
     whether a string matches any of them.
@@ -77,7 +77,7 @@ def convert_dir_regex_to_dir_prefix_regex(dir_regex):
         return dir_regex + r'.*?/'
 
 
-class IntegerRange(object):
+class IntegerRange:
     """
     Hold a range of two integers. If the range value is None, it indicates that
     the value should be treated as -Inf (for begin) or +Inf (for end).
@@ -110,7 +110,7 @@ def __contains__(self, item):
         return ge_begin and le_end
 
 
-class ScanPoliciesManager(object):
+class ScanPoliciesManager:
     """
     Policy object used when scanning folders for syncing, used to decide
     which files to include in the list of files to be synced.
diff --git a/b2sdk/transfer/emerge/executor.py b/b2sdk/transfer/emerge/executor.py
@@ -18,12 +18,11 @@
 from b2sdk.file_lock import FileRetentionSetting, LegalHold, NO_RETENTION_FILE_SETTING
 from b2sdk.transfer.outbound.large_file_upload_state import LargeFileUploadState
 from b2sdk.transfer.outbound.upload_source import UploadSourceStream
-from b2sdk.utils import interruptible_get_result
 
 AUTO_CONTENT_TYPE = 'b2/x-auto'
 
 
-class EmergeExecutor(object):
+class EmergeExecutor:
     def __init__(self, services):
         self.services = services
 
@@ -214,7 +213,7 @@ def execute_plan(self, emerge_plan):
             # Collect the sha1 checksums of the parts as the uploads finish.
             # If any of them raised an exception, that same exception will
             # be raised here by result()
-            part_sha1_array = [interruptible_get_result(f)['contentSha1'] for f in part_futures]
+            part_sha1_array = [f.result()['contentSha1'] for f in part_futures]
 
         # Finish the large file
         response = self.services.session.finish_large_file(file_id, part_sha1_array)
diff --git a/b2sdk/transfer/emerge/planner/planner.py b/b2sdk/transfer/emerge/planner/planner.py
@@ -30,7 +30,7 @@
 GIGABYTE = 1000 * MEGABYTE
 
 
-class UploadBuffer(object):
+class UploadBuffer:
     """ data container used by EmergePlanner for temporary storage of write intents """
 
     def __init__(self, start_offset, buff=None):
@@ -80,7 +80,7 @@ def get_slice(self, start_idx=None, end_idx=None, start_offset=None):
         return self.__class__(start_offset, buff_slice)
 
 
-class EmergePlanner(object):
+class EmergePlanner:
     """ Creates a list of actions required for advanced creation of an object in the cloud from an iterator of write intent objects """
     DEFAULT_MIN_PART_SIZE = 5 * MEGABYTE
     DEFAULT_RECOMMENDED_UPLOAD_PART_SIZE = 100 * MEGABYTE
@@ -447,7 +447,7 @@ def _validatation_iterator(self, write_intents):
             yield write_intent
 
 
-class IntentsState(object):
+class IntentsState:
     """ Store and process state of incoming write intents to solve
     overlapping intents selection in streaming manner.
 
@@ -651,7 +651,7 @@ def _peek_for_large_file(self, emerge_parts_iterator):
             return chain([first_part, second_part], emerge_parts_iterator), True
 
 
-class EmergePart(object):
+class EmergePart:
     def __init__(self, part_definition, verification_ranges=None):
         self.part_definition = part_definition
         self.verification_ranges = verification_ranges
diff --git a/b2sdk/transfer/emerge/write_intent.py b/b2sdk/transfer/emerge/write_intent.py
@@ -9,7 +9,7 @@
 ######################################################################
 
 
-class WriteIntent(object):
+class WriteIntent:
     """ Wrapper for outbound source that defines destination offset. """
 
     def __init__(self, outbound_source, destination_offset=0):
diff --git a/b2sdk/transfer/inbound/downloader/parallel.py b/b2sdk/transfer/inbound/downloader/parallel.py
@@ -330,7 +330,7 @@ def download_non_first_part(
         retries_left -= 1
 
 
-class PartToDownload(object):
+class PartToDownload:
     """
     Hold the range of a file to download, and the range of the
     local file where it should be stored.
diff --git a/b2sdk/transfer/outbound/large_file_upload_state.py b/b2sdk/transfer/outbound/large_file_upload_state.py
@@ -11,7 +11,7 @@
 import threading
 
 
-class LargeFileUploadState(object):
+class LargeFileUploadState:
     """
     Track the status of uploading a large file, accepting updates
     from the tasks that upload each of the parts.
diff --git a/b2sdk/utils/__init__.py b/b2sdk/utils/__init__.py
@@ -23,23 +23,6 @@
 from logfury.v1 import DefaultTraceAbstractMeta, DefaultTraceMeta, limit_trace_arguments, disable_trace, trace_call
 
 
-def interruptible_get_result(future):
-    """
-    Wait for the result of a future in a way that can be interrupted
-    by a KeyboardInterrupt.
-
-    This is not necessary in Python 3, but is needed for Python 2.
-
-    :param future: a future to get result of
-    :type future: Future
-    """
-    while True:
-        try:
-            return future.result(timeout=1.0)
-        except futures.TimeoutError:
-            pass
-
-
 def b2_url_encode(s):
     """
     URL-encode a unicode string to be sent to B2 in an HTTP header.
@@ -289,7 +272,7 @@ def fix_windows_path_limit(path):
         return path
 
 
-class TempDir(object):
+class TempDir:
     """
     Context manager that creates and destroys a temporary directory.
     """
@@ -419,7 +402,7 @@ class B2TraceMetaAbstract(DefaultTraceAbstractMeta):
     pass
 
 
-class ConcurrentUsedAuthTokenGuard(object):
+class ConcurrentUsedAuthTokenGuard:
     """
     Context manager preventing two tokens being used simultaneously.
     Throws UploadTokenUsedConcurrently when unable to acquire a lock
diff --git a/b2sdk/utils/range_.py b/b2sdk/utils/range_.py
@@ -9,7 +9,7 @@
 ######################################################################
 
 
-class Range(object):
+class Range:
     """
     HTTP ranges use an *inclusive* index at the end.
     """
diff --git a/b2sdk/v0/account_info.py b/b2sdk/v0/account_info.py
@@ -12,7 +12,7 @@
 from b2sdk import v1
 
 
-class OldAccountInfoMethods(object):
+class OldAccountInfoMethods:
     """ this class contains proxy methods for deprecated signatures renamed for consistency in mid-2019 """
 
     def get_account_id_or_app_key_id(self):
diff --git a/b2sdk/v1/sync/file.py b/b2sdk/v1/sync/file.py
diff --git a/test/unit/bucket/test_bucket.py b/test/unit/bucket/test_bucket.py
diff --git a/test/unit/v0/test_bucket.py b/test/unit/v0/test_bucket.py
diff --git a/test/unit/v0/test_sync.py b/test/unit/v0/test_sync.py
diff --git a/test/unit/v1/test_sync.py b/test/unit/v1/test_sync.py
