Implement version parse caching (#125)

.pre-commit-config.yaml

@@ -1,34 +1,40 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-        language_version: python3
-  - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
-    hooks:
-      - id: flake8
-        additional_dependencies: [flake8-eradicate==1.2.0]
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
       - id: check-toml
       - id: check-yaml
       - id: check-case-conflict
       - id: check-docstring-first
       - id: end-of-file-fixer
       - id: trailing-whitespace
+
   - repo: https://github.com/PyCQA/isort
     rev: 5.10.1
     hooks:
       - id: isort
         additional_dependencies: [toml]
+
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.1
+    rev: v2.38.4  # DO NOT UPGRADE THIS - v3 drops python 2 support
     hooks:
       - id: pyupgrade
+
   - repo: https://github.com/myint/docformatter
-    rev: v1.4
+    rev: v1.5.0
     hooks:
       - id: docformatter
         args: [--in-place, --pre-summary-newline]
+
+  - repo: https://github.com/psf/black
+    rev: 22.10.0
+    hooks:
+      - id: black
+        language_version: python3
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 5.0.4
+    hooks:
+      - id: flake8
+        additional_dependencies: [flake8-eradicate~=1.4]

qbittorrentapi/_version_support.py

@@ -1,3 +1,11 @@
+from pkg_resources import parse_version
+
+try:
+    from functools import lru_cache
+except ImportError:
+    from backports.functools_lru_cache import lru_cache
+
+
 APP_VERSION_2_API_VERSION_MAP = {
     "v4.1.0": "2.0",
     "v4.1.1": "2.0.1",
@@ -40,6 +48,12 @@
 MOST_RECENT_SUPPORTED_API_VERSION = "2.8.5"
 
 
+@lru_cache(maxsize=None)
+def v(version):
+    """Caching version parser."""
+    return parse_version(version)
+
+
 class Version(object):
     """
     Allows introspection for whether this Client supports different versions of

qbittorrentapi/_version_support.pyi

@@ -2,10 +2,14 @@ from typing import Dict
 from typing import Set
 from typing import Text
 
+from pkg_resources.extern.packaging.version import Version as _Version
+
 MOST_RECENT_SUPPORTED_APP_VERSION: Text
 MOST_RECENT_SUPPORTED_API_VERSION: Text
 APP_VERSION_2_API_VERSION_MAP: Dict
 
+def v(version: Text) -> _Version: ...
+
 class Version:
     _supported_app_versions: Set = None
     _supported_api_versions: Set = None

qbittorrentapi/decorators.py

@@ -2,8 +2,7 @@
 from json import loads
 from logging import getLogger
 
-from pkg_resources import parse_version as v
-
+from qbittorrentapi._version_support import v
 from qbittorrentapi.exceptions import APIError
 from qbittorrentapi.exceptions import HTTP403Error
 

qbittorrentapi/rss.py

@@ -1,7 +1,6 @@
 from json import dumps
 
-from pkg_resources import parse_version as v
-
+from qbittorrentapi._version_support import v
 from qbittorrentapi.app import AppAPIMixIn
 from qbittorrentapi.decorators import alias
 from qbittorrentapi.decorators import aliased

qbittorrentapi/torrents.py

@@ -3,8 +3,6 @@
 from os import path
 from os import strerror as os_strerror
 
-from pkg_resources import parse_version as v
-
 try:
     from collections.abc import Iterable
     from collections.abc import Mapping
@@ -14,6 +12,7 @@
 
 from six import text_type as six_text_type
 
+from qbittorrentapi._version_support import v
 from qbittorrentapi.app import AppAPIMixIn
 from qbittorrentapi.decorators import alias
 from qbittorrentapi.decorators import aliased

tests/conftest.py

@@ -5,13 +5,13 @@
 
 import pytest
 import six
-from pkg_resources import parse_version as v
 
 from qbittorrentapi import APIConnectionError
 from qbittorrentapi import Client
 from qbittorrentapi._version_support import (
     APP_VERSION_2_API_VERSION_MAP as api_version_map,
 )
+from qbittorrentapi._version_support import v
 
 environ.setdefault("QBITTORRENTAPI_HOST", "localhost:8080")
 environ.setdefault("QBITTORRENTAPI_USERNAME", "admin")

tests/test_app.py

@@ -1,7 +1,7 @@
 import pytest
-from pkg_resources import parse_version as v
 
 from qbittorrentapi._attrdict import AttrDict
+from qbittorrentapi._version_support import v
 from tests.conftest import IS_QBT_DEV
 
 

tests/test_request.py

@@ -9,12 +9,12 @@
     from mock import MagicMock
 
 import pytest
-from pkg_resources import parse_version as v
 from requests import Response
 
 from qbittorrentapi import APINames
 from qbittorrentapi import Client
 from qbittorrentapi import exceptions
+from qbittorrentapi._version_support import v
 from qbittorrentapi.request import Request
 from qbittorrentapi.torrents import TorrentDictionary
 from qbittorrentapi.torrents import TorrentInfoList

tests/test_rss.py

@@ -1,8 +1,8 @@
 from time import sleep
 
 import pytest
-from pkg_resources import parse_version as v
 
+from qbittorrentapi._version_support import v
 from qbittorrentapi.rss import RSSitemsDictionary
 from tests.conftest import check
 from tests.conftest import get_func

tests/test_search.py

@@ -1,9 +1,9 @@
 from time import sleep
 
 import pytest
-from pkg_resources import parse_version as v
 
 from qbittorrentapi import NotFound404Error
+from qbittorrentapi._version_support import v
 from qbittorrentapi.search import SearchJobDictionary
 from qbittorrentapi.search import SearchResultsDictionary
 from qbittorrentapi.search import SearchStatusesList

tests/test_torrent.py

@@ -2,7 +2,6 @@
 from time import sleep
 
 import pytest
-from pkg_resources import parse_version as v
 
 from qbittorrentapi import Conflict409Error
 from qbittorrentapi import TorrentDictionary
@@ -12,6 +11,7 @@
 from qbittorrentapi import TorrentStates
 from qbittorrentapi import TrackersList
 from qbittorrentapi import WebSeedsList
+from qbittorrentapi._version_support import v
 from tests.conftest import get_func
 from tests.test_torrents import check
 from tests.test_torrents import disable_queueing

tests/test_torrents.py

@@ -4,8 +4,6 @@
 from sys import version_info
 from time import sleep
 
-from pkg_resources import parse_version as v
-
 try:
     from collections.abc import Iterable
 except ImportError:
@@ -14,6 +12,7 @@
 import pytest
 import requests
 
+from qbittorrentapi._version_support import v
 from qbittorrentapi.exceptions import Conflict409Error
 from qbittorrentapi.exceptions import Forbidden403Error
 from qbittorrentapi.exceptions import InvalidRequest400Error

tests/test_transfer.py

@@ -1,6 +1,6 @@
 import pytest
-from pkg_resources import parse_version as v
 
+from qbittorrentapi._version_support import v
 from qbittorrentapi.transfer import TransferInfoDictionary