diff -r e836d196e888 -r f425b578ede7 eric6/ThirdParty/CharDet/chardet/__init__.py
--- a/eric6/ThirdParty/CharDet/chardet/__init__.py Wed Jan 13 19:02:58 2021 +0100
+++ b/eric6/ThirdParty/CharDet/chardet/__init__.py Wed Jan 13 19:05:48 2021 +0100
@@ -16,11 +16,14 @@
######################### END LICENSE BLOCK #########################
-from .compat import PY2, PY3
from .universaldetector import UniversalDetector
+from .enums import InputState
from .version import __version__, VERSION
+__all__ = ['UniversalDetector', 'detect', 'detect_all', '__version__', 'VERSION']
+
+
def detect(byte_str):
"""
Detect the encoding of the given byte string.
@@ -31,9 +34,50 @@
if not isinstance(byte_str, bytearray):
if not isinstance(byte_str, bytes):
raise TypeError('Expected object of type bytes or bytearray, got: '
- '{0}'.format(type(byte_str)))
+ '{}'.format(type(byte_str)))
else:
byte_str = bytearray(byte_str)
detector = UniversalDetector()
detector.feed(byte_str)
return detector.close()
+
+
+def detect_all(byte_str):
+ """
+ Detect all the possible encodings of the given byte string.
+
+ :param byte_str: The byte sequence to examine.
+ :type byte_str: ``bytes`` or ``bytearray``
+ """
+ if not isinstance(byte_str, bytearray):
+ if not isinstance(byte_str, bytes):
+ raise TypeError('Expected object of type bytes or bytearray, got: '
+ '{}'.format(type(byte_str)))
+ else:
+ byte_str = bytearray(byte_str)
+
+ detector = UniversalDetector()
+ detector.feed(byte_str)
+ detector.close()
+
+ if detector._input_state == InputState.HIGH_BYTE:
+ results = []
+ for prober in detector._charset_probers:
+ if prober.get_confidence() > detector.MINIMUM_THRESHOLD:
+ charset_name = prober.charset_name
+ lower_charset_name = prober.charset_name.lower()
+ # Use Windows encoding name instead of ISO-8859 if we saw any
+ # extra Windows-specific bytes
+ if lower_charset_name.startswith('iso-8859'):
+ if detector._has_win_bytes:
+ charset_name = detector.ISO_WIN_MAP.get(lower_charset_name,
+ charset_name)
+ results.append({
+ 'encoding': charset_name,
+ 'confidence': prober.get_confidence(),
+ 'language': prober.language,
+ })
+ if len(results) > 0:
+ return sorted(results, key=lambda result: -result['confidence'])
+
+ return [detector.result]
