run pyupgrade --py38-plus

Author: mdujava

Pipfile

@@ -4,11 +4,14 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
+black = "*"
+flake8 = "*"
+mypy = "*"
 pylint = "*"
 pytest = "*"
-responses = "*"
 python-dotenv = "*"
-flake8 = "*"
+responses = "*"
+types-requests = "*"
 
 [packages]
 requests = "*"

setup.py

@@ -3,7 +3,7 @@
 
 from setuptools import find_packages, setup
 
-with open("README.md", "r") as fh:
+with open("README.md") as fh:
     long_description = fh.read()
 
 VERSION = "devel"
@@ -12,45 +12,36 @@
     VERSION = sys.argv.pop(1)
     assert re.match(r"[0-9]+\.[0-9]+\.[0-9]+", VERSION), "Version definition required as first arg"
 
-requirements = ['requests', 'backoff']
+requirements = ["requests", "backoff"]
 
-extra_requirements = {
-    'dev': [
-        'pytest',
-        'coverage',
-        'python-dotenv',
-        'responses'
+extra_requirements = {"dev": ["pytest", "coverage", "python-dotenv", "responses"], "docs": ["sphinx"]}
 
+setup(
+    name="3scale-api",
+    version=VERSION,
+    description="3scale API python client",
+    author="Peter Stanko",
+    author_email="stanko@mail.muni.cz",
+    maintainer="Peter Stanko",
+    url="https://github.com/3scale-qe/3scale-api-python",
+    packages=find_packages(exclude=("tests",)),
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    include_package_data=True,
+    install_requires=requirements,
+    extras_require=extra_requirements,
+    entry_points={},
+    classifiers=[
+        "Operating System :: OS Independent",
+        "License :: OSI Approved :: Apache Software License",
+        "Intended Audience :: Developers",
+        "Topic :: Utilities",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ],
-    'docs': ['sphinx']
-}
-
-setup(name='3scale-api',
-      version=VERSION,
-      description='3scale API python client',
-      author='Peter Stanko',
-      author_email='stanko@mail.muni.cz',
-      maintainer='Peter Stanko',
-      url='https://github.com/3scale-qe/3scale-api-python',
-      packages=find_packages(exclude=("tests",)),
-      long_description=long_description,
-      long_description_content_type='text/markdown',
-      include_package_data=True,
-      install_requires=requirements,
-      extras_require=extra_requirements,
-      entry_points={},
-      classifiers=[
-          "Operating System :: OS Independent",
-          "License :: OSI Approved :: Apache Software License",
-          'Intended Audience :: Developers',
-          'Topic :: Utilities',
-          "Programming Language :: Python :: 3",
-          'Programming Language :: Python :: 3.7',
-          'Programming Language :: Python :: 3.8',
-          'Programming Language :: Python :: 3.9',
-          'Programming Language :: Python :: 3.10',
-          'Programming Language :: Python :: 3.11',
-          'Programming Language :: Python :: 3.12',
-          'Programming Language :: Python :: 3.13',
-      ],
-      )
+)

tests/integration/auth/test_app_key_authorization.py

@@ -19,7 +19,7 @@ def proxy(service, proxy):
 def test_app_key_authorization(proxy, application, ssl_verify):
     creds = application.authobj().credentials
     encoded = base64.b64encode(
-        f"{creds['app_id']}:{creds['app_key']}".encode("utf-8")).decode("utf-8")
+        f"{creds['app_id']}:{creds['app_key']}".encode()).decode("utf-8")
 
     response = application.test_request(verify=ssl_verify)
 

tests/integration/test_integration_response_headers.py

@@ -1,4 +1,3 @@
-
 def test_x_served_by(api):
     response = api._rest.get(url=api.admin_api_url + '/accounts')
     assert response.status_code == 200

tests/integration/test_integration_service_plans.py

@@ -1,5 +1,3 @@
-
-
 from tests.integration import asserts
 
 def test_list_service_plans(service):

tests/integration/test_integration_service_subscriptions.py

@@ -1,4 +1,3 @@
-
 from tests.integration import asserts
 
 def test_list_service_subscriptions(account):

threescale_api/client.py

@@ -69,7 +69,7 @@ def __init__(self, url: str, token: str,
             time.sleep(wait)
 
     @backoff.on_predicate(
-            backoff.constant, lambda ready: not ready, interval=6, max_tries=90, jitter=None)
+        backoff.constant, lambda ready: not ready, interval=6, max_tries=90, jitter=None)
     def wait_for_tenant(self) -> bool:
         """
         When True is returned, there is some chance the tenant is actually ready.

threescale_api/defaults.py

@@ -334,9 +334,7 @@ def __repr__(self) -> str:
 
     def __eq__(self, other) -> bool:
         return (
-            self.__class__ == other.__class__ and
-            self.entity_name == other.entity_name and
-            self.entity_id == other.entity_id
+            self.__class__ == other.__class__ and self.entity_name == other.entity_name and self.entity_id == other.entity_id
         )
 
     def get(self, item):