mnamer 2.5.5.dev94__tar.gz → 2.5.6.dev7__tar.gz

mnamer-2.5.6.dev7/.github/actions/init/action.yml

@@ -0,0 +1,19 @@
+name: Init
+description: Sets up the environment for build, lint, and test jobs
+
+runs:
+  using: composite
+  steps:
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+        
+    - name: Install uv
+      uses: astral-sh/setup-uv@v4
+      with:
+        enable-cache: true
+        cache-dependency-glob: "**/pyproject.toml"
+
+    - name: Install dependencies
+      shell: sh
+      run: uv sync --dev

mnamer-2.5.6.dev7/.github/actions/lint/action.yml

@@ -0,0 +1,31 @@
+name: Lint
+description: Lints the codebase with ruff and mypy
+
+inputs:
+  ruff:
+    description: Whether to run ruff
+    required: false
+    default: "true"
+
+  mypy:
+    description: Whether to run mypy
+    required: false
+    default: "true"
+
+runs:
+  using: composite
+  steps:
+    - name: Linting with ruff
+      if: inputs.ruff == 'true'
+      run: uv run ruff check mnamer tests
+      shell: sh
+
+    - name: Formatting with ruff
+      if: inputs.ruff == 'true'
+      run: uv run ruff format --check mnamer tests
+      shell: sh
+
+    - name: Type checking with mypy
+      if: inputs.mypy == 'true'
+      run: uv run mypy mnamer tests
+      shell: sh

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/.github/actions/test/action.yml

@@ -5,22 +5,22 @@ inputs:
   local:
     description: Whether to run local tests
     required: false
-    default: true
+    default: "true"
 
   network:
     description: Whether to run network tests
     required: false
-    default: true
+    default: "true"
 
   e2e:
     description: Whether to run end to end tests
     required: false
-    default: true
+    default: "true"
 
   coverage:
     description: Whether to report coverage statistics
     required: false
-    default: false
+    default: "false"
 
 runs:
   using: composite
@@ -28,7 +28,7 @@ runs:
     - name: Running Local Unit Tests
       if: inputs.local == 'true'
       run: >-
-        python -m pytest
+        uv run pytest
         -m local
         --durations=10
         --cov=./
@@ -40,7 +40,7 @@ runs:
     - name: Running Network Unit Tests
       if: inputs.network == 'true'
       run: >-
-        python -m pytest
+        uv run pytest
         -m network
         --reruns 3
         --durations=10
@@ -53,7 +53,7 @@ runs:
     - name: Running End to End Tests
       if: inputs.e2e == 'true'
       run: >-
-        python -m pytest
+        uv run pytest
         -m e2e
         --reruns 3
         --durations=10
@@ -71,7 +71,7 @@ runs:
         && failure()
 
     - name: Reporting Coverage Statistics
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v5
       if: >-
         success()
         && inputs.coverage == 'true'

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/.github/dependabot.yml

@@ -9,3 +9,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

mnamer-2.5.6.dev7/.github/workflows/publish.yml

@@ -0,0 +1,23 @@
+name: publish
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  publish-pypi:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with: { fetch-depth: 0 } # required for setuptools_scm to detect git tags
+      - uses: ./.github/actions/init
+
+      - name: Building
+        run: uv build
+
+      - name: Reporting Version
+        run: uv run python -m mnamer --version
+
+      - name: Uploading to PyPI
+        run: uv publish --token ${{secrets.pypi_password}}

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/.github/workflows/pull_request.yml

@@ -7,26 +7,24 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/init
 
       - name: Linting
         uses: ./.github/actions/lint
         with:
-          black: true
-          isort: true
-          pyflakes: true
+          ruff: true
           mypy: true
 
   test:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/init
 
       - name: Testing (contributor)
-      - uses: ./.github/actions/test
+        uses: ./.github/actions/test
         if: github.actor != 'dependabot[bot]'
         with:
           local: true
@@ -35,7 +33,7 @@ jobs:
           coverage: false
 
       - name: Testing (dependabot)
-      - uses: ./.github/actions/test
+        uses: ./.github/actions/test
         if: github.actor == 'dependabot[bot]'
         with:
           local: true

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/.github/workflows/push.yml

@@ -2,15 +2,21 @@ name: push
 
 on:
   push:
+    branches:
+      - main
   schedule:
     - cron: "0 8 * * 1" # mondays at 8am
+  release:
+    types:
+      - published
+      - prereleased
 
 jobs:
   lint:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/init
       - uses: ./.github/actions/lint
 
@@ -18,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/init
       - uses: ./.github/actions/test
         with:
@@ -28,8 +34,6 @@ jobs:
           coverage: true
 
   publish-pypi:
-    runs-on: ubuntu-latest
-
     if: >-
       success()
       && github.event_name == 'push'
@@ -39,20 +43,7 @@ jobs:
       - lint
       - test
 
-    steps:
-      - uses: actions/checkout@v3
-        with: { fetch-depth: 0 } # required for setuptools_scm to detect git tags
-      - uses: ./.github/actions/init
-
-      - name: Building
-        run: python3 -m build --sdist --wheel --no-isolation
-
-      - name: Reporting Version
-        run: python3 -m mnamer --version
+    secrets:
+      inherit
 
-      - name: Uploading to PyPI
-        run: >-
-          twine upload
-          --username __token__
-          --password ${{secrets.pypi_password}}
-          dist/*
+    uses: ./.github/workflows/publish.yml

mnamer-2.5.6.dev7/.python-version

@@ -0,0 +1 @@
+3.13

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/Dockerfile

@@ -1,5 +1,5 @@
 FROM python:alpine
-ARG MNAMER_VERSION=2.5.4
+ARG MNAMER_VERSION=2.5.5
 ARG UID=1000
 ARG GID=1000
 RUN addgroup mnamer -g $GID

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: mnamer
-Version: 2.5.5.dev94
+Version: 2.5.6.dev7
 Summary: A command-line utility for organizing media files.
 Author-email: Jessy Williams <jessy@jessywilliams.com>
 Maintainer-email: Jessy Williams <jessy@jessywilliams.com>
@@ -27,16 +27,24 @@ License: MIT License
         SOFTWARE.
         
 Project-URL: repository, https://github.com/jkwill87/mnamer
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Provides-Extra: dev
 License-File: LICENSE.txt
+Requires-Dist: appdirs>=1.4.4
+Requires-Dist: babelfish>=0.6.0
+Requires-Dist: guessit>=3.8.0
+Requires-Dist: requests>=2.32.0
+Requires-Dist: requests-cache~=0.9.8
+Requires-Dist: setuptools-scm>=8.0.0
+Requires-Dist: teletype>=1.3.4
+Requires-Dist: typing-extensions>=4.7.0
+Dynamic: license-file
 
 [![PyPI](https://img.shields.io/pypi/v/mnamer.svg?style=for-the-badge)](https://pypi.python.org/pypi/mnamer)
 [![Tests](https://img.shields.io/github/actions/workflow/status/jkwill87/mnamer/.github/workflows/push.yml?branch=main&style=for-the-badge&label=Tests)](https://github.com/jkwill87/mnamer/actions/workflows/push.yml?query=branch:main)
 [![Coverage](https://img.shields.io/codecov/c/github/jkwill87/mnamer/main.svg?style=for-the-badge)](https://codecov.io/gh/jkwill87/mnamer)
 [![Licence](https://img.shields.io/github/license/jkwill87/mnamer.svg?style=for-the-badge)](https://en.wikipedia.org/wiki/MIT_License)
-[![Style: Black](https://img.shields.io/badge/Style-Black-black.svg?style=for-the-badge)](https://github.com/ambv/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json&style=for-the-badge)](https://github.com/astral-sh/ruff)
 
 <img src="https://github.com/jkwill87/mnamer/raw/main/assets/logo.png" width="450"/>
 
@@ -54,7 +62,7 @@ Check out the [wiki page](https://github.com/jkwill87/mnamer/wiki) for more deta
 
 💾 [**Installation**](https://github.com/jkwill87/mnamer/wiki/Installation)
 
-`$ pip3 install --user mnamer`
+`$ uv add mnamer` or `$ pip3 install --user mnamer`
 
 🤖 [**Automation**](https://github.com/jkwill87/mnamer/wiki/Automation)
 
@@ -124,6 +132,6 @@ Parameters can either by entered as command line arguments or from a config file
 
 ## Contributions
 
-Community contributions are a welcome addition to the project. In order to be merged upsteam any additions will need to be formatted with [black](https://black.readthedocs.io) for consistency with the rest of the project and pass the continuous integration tests run against each PR. Before introducing any major features or changes to the configuration api please consider opening [an issue](https://github.com/jkwill87/mnamer/issues) to outline your proposal.
+Community contributions are a welcome addition to the project. In order to be merged upsteam any additions will need to be formatted with [ruff](https://docs.astral.sh/ruff/) for consistency with the rest of the project and pass the continuous integration tests run against each PR. Before introducing any major features or changes to the configuration api please consider opening [an issue](https://github.com/jkwill87/mnamer/issues) to outline your proposal.
 
 Bug reports are also welcome on the [issue page](https://github.com/jkwill87/mnamer/issues). Please include any generated crash reports if applicable. Feature requests are welcome but consider checking out [if it is in the works](https://github.com/jkwill87/mnamer/issues?q=label%3Arequest) first to avoid duplication.

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/README.md

@@ -2,7 +2,7 @@
 [![Tests](https://img.shields.io/github/actions/workflow/status/jkwill87/mnamer/.github/workflows/push.yml?branch=main&style=for-the-badge&label=Tests)](https://github.com/jkwill87/mnamer/actions/workflows/push.yml?query=branch:main)
 [![Coverage](https://img.shields.io/codecov/c/github/jkwill87/mnamer/main.svg?style=for-the-badge)](https://codecov.io/gh/jkwill87/mnamer)
 [![Licence](https://img.shields.io/github/license/jkwill87/mnamer.svg?style=for-the-badge)](https://en.wikipedia.org/wiki/MIT_License)
-[![Style: Black](https://img.shields.io/badge/Style-Black-black.svg?style=for-the-badge)](https://github.com/ambv/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json&style=for-the-badge)](https://github.com/astral-sh/ruff)
 
 <img src="https://github.com/jkwill87/mnamer/raw/main/assets/logo.png" width="450"/>
 
@@ -20,7 +20,7 @@ Check out the [wiki page](https://github.com/jkwill87/mnamer/wiki) for more deta
 
 💾 [**Installation**](https://github.com/jkwill87/mnamer/wiki/Installation)
 
-`$ pip3 install --user mnamer`
+`$ uv add mnamer` or `$ pip3 install --user mnamer`
 
 🤖 [**Automation**](https://github.com/jkwill87/mnamer/wiki/Automation)
 
@@ -90,6 +90,6 @@ Parameters can either by entered as command line arguments or from a config file
 
 ## Contributions
 
-Community contributions are a welcome addition to the project. In order to be merged upsteam any additions will need to be formatted with [black](https://black.readthedocs.io) for consistency with the rest of the project and pass the continuous integration tests run against each PR. Before introducing any major features or changes to the configuration api please consider opening [an issue](https://github.com/jkwill87/mnamer/issues) to outline your proposal.
+Community contributions are a welcome addition to the project. In order to be merged upsteam any additions will need to be formatted with [ruff](https://docs.astral.sh/ruff/) for consistency with the rest of the project and pass the continuous integration tests run against each PR. Before introducing any major features or changes to the configuration api please consider opening [an issue](https://github.com/jkwill87/mnamer/issues) to outline your proposal.
 
 Bug reports are also welcome on the [issue page](https://github.com/jkwill87/mnamer/issues). Please include any generated crash reports if applicable. Feature requests are welcome but consider checking out [if it is in the works](https://github.com/jkwill87/mnamer/issues?q=label%3Arequest) first to avoid duplication.

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/__main__.py

@@ -17,13 +17,13 @@ def main():  # pragma: no cover
         settings.load()
     except MnamerException as e:
         tty.error(e)
-        raise SystemExit(2)
+        raise SystemExit(2) from None
     try:
         frontend = Cli(settings)
         frontend.launch()
     except SystemExit:
         raise
-    except:
+    except Exception:
         if IS_DEBUG:
             # allow exceptions to raised when debugging
             raise

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/__version__.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
 
-__version__ = "2.5.5.dev94"
+__version__ = "2.5.6.dev7"

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/endpoints.py

@@ -35,7 +35,7 @@ def omdb_title(
     if (not title and not id_imdb) or (title and id_imdb):
         raise MnamerException("either id_imdb or title must be specified")
     elif plot and plot not in OMDB_PLOT_TYPES:
-        raise MnamerException("plot must be one of %s" % ",".join(OMDB_PLOT_TYPES))
+        raise MnamerException(f"plot must be one of {','.join(OMDB_PLOT_TYPES)}")
     url = "http://www.omdbapi.com"
     parameters = {
         "apikey": api_key,

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/language.py

@@ -53,8 +53,8 @@ class Language:
         try:
             if getattr(value, "alpha3", None):
                 return cls(value.name, value.alpha2, value.alpha3)
-        except:
-            raise MnamerException("Could not determine language")
+        except Exception:
+            raise MnamerException("Could not determine language") from None
         value = value.lower()
         for row in KNOWN_LANGUAGES:
             for item in row:
@@ -99,4 +99,4 @@ class Language:
             "zh",
         }
         if language is not None and language.a2 not in valid:
-            raise MnamerException("'lang' must be one of %s" % ",".join(valid))
+            raise MnamerException(f"'lang' must be one of {','.join(valid)}")

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/metadata.py

@@ -3,8 +3,9 @@ from __future__ import annotations
 import dataclasses
 import datetime as dt
 import re
+from collections.abc import Callable, Mapping, Sequence
 from string import Formatter
-from typing import Any, Callable, Mapping, Sequence
+from typing import Any
 
 from mnamer.language import Language
 from mnamer.types import MediaType

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/providers.py

@@ -4,8 +4,8 @@ from __future__ import annotations
 
 import datetime as dt
 from abc import ABC, abstractmethod
+from collections.abc import Iterator
 from os import environ
-from typing import Iterator
 
 from mnamer.endpoints import (
     omdb_search,
@@ -242,8 +242,7 @@ class Tvdb(Provider):
             )
         else:
             raise MnamerNotFoundException
-        for result in results:
-            yield result
+        yield from results
 
     def _search_id(
         self,

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/setting_store.py

@@ -1,7 +1,8 @@
 import dataclasses
 import json
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable
+from typing import Any
 
 from mnamer.argument import ArgLoader
 from mnamer.const import SUBTITLE_CONTAINERS
@@ -424,7 +425,7 @@ class SettingStore:
         try:
             arguments = arg_loader.load()
         except RuntimeError as e:
-            raise MnamerException(e)
+            raise MnamerException(e) from e
         config_path = arguments.get("config_path", crawl_out(".mnamer-v2.json"))
         config = json_loads(str(config_path)) if config_path else {}
         if not self.config_ignore and not arguments.get("config_ignore"):
@@ -447,4 +448,4 @@ class SettingStore:
 
     def formatting_for(self, media: MediaType | Metadata) -> str:
         """Returns the formatting string for a given media type or metadata."""
-        return getattr(self, f"{ media.to_media_type().value}_format")
+        return getattr(self, f"{media.to_media_type().value}_format")

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/target.py

@@ -4,7 +4,7 @@ import datetime as dt
 from os import path
 from pathlib import Path
 from shutil import move
-from typing import Any, ClassVar, Type
+from typing import Any, ClassVar
 
 from guessit import guessit  # type: ignore
 
@@ -58,7 +58,7 @@ class Target:
             return str(self.source)
 
     @classmethod
-    def populate_paths(cls: Type[Target], settings: SettingStore) -> list[Target]:
+    def populate_paths(cls: type[Target], settings: SettingStore) -> list[Target]:
         """Creates a list of Target objects for media files found in paths."""
         file_paths = crawl_in(settings.targets, settings.recurse)
         file_paths = filter_blacklist(file_paths, settings.ignore)
@@ -132,9 +132,9 @@ class Target:
                     path_data[k] = Language.parse(v)
                 except MnamerException:
                     continue
-            elif isinstance(v, (int, str, dt.date)):
+            elif isinstance(v, int | str | dt.date):
                 path_data[k] = v
-            elif isinstance(v, list) and all([isinstance(_, (int, str)) for _ in v]):
+            elif isinstance(v, list) and all(isinstance(_, int | str) for _ in v):
                 path_data[k] = v[0]
         if self._settings.media:
             media_type = self._settings.media
@@ -244,5 +244,5 @@ class Target:
         destination_path.parent.mkdir(parents=True, exist_ok=True)
         try:
             move(str(self.source), destination_path)
-        except OSError:  # pragma: no cover
-            raise MnamerException
+        except OSError as e:  # pragma: no cover
+            raise MnamerException from e

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/tty.py

@@ -1,7 +1,8 @@
 """Provides an interface for handling user input and printing output."""
 
 import traceback
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from teletype import codes
 from teletype.components import ChoiceHelper, SelectOne
@@ -28,9 +29,9 @@ def _chars() -> dict[str, str]:
     return chars
 
 
-def _abort_helpers() -> (
-    tuple[ChoiceHelper[MnamerSkipException], ChoiceHelper[MnamerAbortException]]
-):
+def _abort_helpers() -> tuple[
+    ChoiceHelper[MnamerSkipException], ChoiceHelper[MnamerAbortException]
+]:
     if no_style:
         style = None
         skip_mnemonic = "[s]"
@@ -90,7 +91,7 @@ def metadata_prompt(matches: list[Metadata]) -> Metadata:  # pragma: no cover
     msg("select match")
     selector = SelectOne([*matches, *_abort_helpers()], **_chars())
     choice = selector.prompt()
-    if isinstance(choice, (MnamerAbortException, MnamerSkipException)):
+    if isinstance(choice, MnamerAbortException | MnamerSkipException):
         raise choice
     return choice
 
@@ -105,7 +106,7 @@ def metadata_guess(metadata: Metadata) -> Metadata:  # pragma: no cover
     option = ChoiceHelper(metadata, label)
     selector = SelectOne([option, *_abort_helpers()], **_chars())
     choice = selector.prompt()
-    if isinstance(choice, (MnamerAbortException, MnamerSkipException)):
+    if isinstance(choice, MnamerAbortException | MnamerSkipException):
         raise choice
     else:
         return choice
@@ -116,7 +117,7 @@ def subtitle_prompt() -> Language:
     choices = [ChoiceHelper(language, language.name) for language in Language.all()]
     selector = SelectOne([*choices, *_abort_helpers()], **_chars())
     choice = selector.prompt()
-    if isinstance(choice, (MnamerAbortException, MnamerSkipException)):
+    if isinstance(choice, MnamerAbortException | MnamerSkipException):
         raise choice
     else:
         return choice

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/types.py

@@ -1,8 +1,8 @@
 """Enum type definitions."""
+
 from __future__ import annotations
 
 from enum import Enum
-from typing import Type
 
 
 class MediaType(Enum):
@@ -10,7 +10,7 @@ class MediaType(Enum):
     MOVIE = "movie"
 
     @classmethod
-    def to_media_type(cls) -> Type[MediaType]:
+    def to_media_type(cls) -> type[MediaType]:
         return cls
 
 

{mnamer-2.5.5.dev94 → mnamer-2.5.6.dev7}/mnamer/utils.py

@@ -3,10 +3,11 @@
 import datetime as dt
 import json
 import re
+from collections.abc import Callable, Iterator
 from os import walk
 from os.path import exists, expanduser, expandvars, getsize, splitdrive, splitext
 from pathlib import Path, PurePath
-from typing import Any, Callable, Iterator
+from typing import Any
 from unicodedata import normalize
 
 import requests_cache
@@ -43,7 +44,7 @@ def crawl_in(file_paths: list[Path], recurse: bool = False) -> list[Path]:
                 found_files.add(Path(root, file).absolute())
             if not recurse:
                 break
-    return sorted(list(found_files))
+    return sorted(found_files)
 
 
 def crawl_out(filename: str | Path | PurePath) -> Path | None:
@@ -157,23 +158,22 @@ def get_session() -> requests_cache.CachedSession:
         return session
 
     if hasattr(get_session, "session"):
-        session: requests_cache.CachedSession = getattr(get_session, "session")
+        session: requests_cache.CachedSession = get_session.session  # type: ignore[attr-defined]
         return session
     session = make_session()
-    setattr(get_session, "session", session)
+    get_session.session = session  # type: ignore[attr-defined]
     return session
 
 
 def get_filesize(path: Path) -> str:
     """Returns the human-readable filesize for a given path."""
     size = float(getsize(path))
-    for unit in ["B", "KB", "MB", "GB", "TB"]:
-        if size < 1024.0:
-            break
+    units = ["B", "KB", "MB", "GB", "TB"]
+    for i, unit in enumerate(units):
+        if size < 1024.0 or i == len(units) - 1:
+            return f"{size:.{2}f}{unit}"
         size /= 1024.0
-    else:
-        return "undetermined size"
-    return f"{size:.{2}f}{unit}"
+    return "undetermined size"
 
 
 def json_dumps(d: dict[str, Any]) -> str:
@@ -194,7 +194,7 @@ def json_loads(path: str) -> dict[str, Any]:
     path = expanduser(path)
     path = expandvars(path)
     if exists(path):
-        with open(path, mode="r") as fp:
+        with open(path) as fp:
             json_data = fp.read()
     return json.loads(json_data) if json_data else {}
 
@@ -242,7 +242,7 @@ def request_json(
     if isinstance(headers, dict):
         headers = clean_dict(headers)
     else:
-        headers = dict()
+        headers = {}
     if isinstance(parameters, dict):
         parameters = [(k, v) for k, v in clean_dict(parameters).items()]
     if body:
@@ -269,7 +269,7 @@ def request_json(
         )
         status = response.status_code
         content = response.json() if status // 100 == 2 else None
-    except:
+    except Exception:
         content = None
         status = 500
     finally: