c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

python3Packages.encutils: fix chardet6 compat

Browse source 
Chardet can return None, don't return it and fallback instead.
This commit is contained in:
Martin Weinelt 2026-07-02 18:01:27 +02:00
commit 343f8dbe89
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 82 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

79
pkgs/development/python-modules/encutils/chardet6-compat.patch Normal file
View file

@ -0,0 +1,79 @@
diff --git a/encutils/__init__.py b/encutils/__init__.py
index 02922be..8a85574 100644
--- a/encutils/__init__.py
+++ b/encutils/__init__.py
@@ -442,7 +442,7 @@ def tryEncodings(text, log=None): # noqa: C901
encoding = chardet.detect(text)["encoding"]
- except ImportError:
+ except (ImportError, AttributeError):
msg = 'Using simplified encoding detection, you might want to install chardet.'
if log:
log.warn(msg)
encutils-1.0.0 on  main [!] is 📦 v1.0.0 via 🐍 v3.13.13
❯ hx encutils/__init__.py
encutils-1.0.0 on  main [!] is 📦 v1.0.0 via 🐍 v3.13.13 took 59s
❯ git diff
diff --git a/encutils/__init__.py b/encutils/__init__.py
index 02922be..100e06e 100644
--- a/encutils/__init__.py
+++ b/encutils/__init__.py
@@ -441,6 +441,8 @@ def tryEncodings(text, log=None): # noqa: C901
import chardet
encoding = chardet.detect(text)["encoding"]
+ if encoding is not None:
+ return encoding
except ImportError:
msg = 'Using simplified encoding detection, you might want to install chardet.'
@@ -449,27 +451,27 @@ def tryEncodings(text, log=None): # noqa: C901
else:
print(msg)
- encodings = (
- 'ascii',
- 'iso-8859-1',
- # 'windows-1252', # test later
- 'utf-8',
- )
- encoding = None
- for e in encodings:
- try:
- text.decode(e)
- except UnicodeDecodeError:
- pass
- else:
- if 'iso-8859-1' == e:
- try:
- if '€' in text.decode('windows-1252'):
- return 'windows-1252'
- except UnicodeDecodeError:
- pass
-
- return e
+ encodings = (
+ 'ascii',
+ 'iso-8859-1',
+ # 'windows-1252', # test later
+ 'utf-8',
+ )
+ encoding = None
+ for e in encodings:
+ try:
+ text.decode(e)
+ except UnicodeDecodeError:
+ pass
+ else:
+ if 'iso-8859-1' == e:
+ try:
+ if '€' in text.decode('windows-1252'):
+ return 'windows-1252'
+ except UnicodeDecodeError:
+ pass
+
+ return e
return encoding

3
pkgs/development/python-modules/encutils/default.nix
View file

@ -18,6 +18,9 @@ buildPythonPackage (finalAttrs: {
hash = "sha256-OOylrxjOur2L5DwX8UydP7uoPMX3rI46schuJMSyuRo=";
};
# expect chardet.detect to return None
patches = [ ./chardet6-compat.patch ];
build-system = [ flit-core ];
dependencies = [