Merge pull request #41 from mdsol/feature/replace-cchardet

Replace `cchardet` with `charset-normalizer`
mdsol · Apr 18, 2023 · d11f814 · d11f814
2 parents 0eb9e4d + 693c53a
commit d11f814
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 56 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [Ubuntu, macOS, Windows]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         include:
           - os: Ubuntu
             image: ubuntu-latest

diff --git a/mauth_client/utils.py b/mauth_client/utils.py
@@ -1,5 +1,5 @@
 import base64
-import cchardet
+import charset_normalizer
 from hashlib import sha512
 
 
@@ -25,10 +25,10 @@ def base64_encode(signature):
 
 def decode(byte_string: bytes) -> str:
     """
-    Attempt to decode a byte string with utf and fallback to cchardet.
+    Attempt to decode a byte string with utf and fallback to charset_normalizer.
     """
     try:
         return byte_string.decode("utf-8")
     except UnicodeDecodeError:
-        encoding = cchardet.detect(byte_string)["encoding"]
+        encoding = charset_normalizer.detect(byte_string)["encoding"]
         return byte_string.decode(encoding)
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -17,6 +17,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
@@ -28,7 +29,7 @@ cachetools = "^5.3"
 rsa = "^4.0"
 importlib-metadata = {version = ">=3.6", python = "<3.8"}
 asgiref = "^3.5.2"
-cchardet = "^2.1.7"
+charset-normalizer = "^3.1.0"
 
 [tool.poetry.dev-dependencies]
 boto3 = "^1.24"

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = clean, flake8-py3, py37, py38, py39, py310, stats
+envlist = clean, flake8-py3, py37, py38, py39, py310, py311, stats
 skipsdist = True
 
 [testenv]