diff -r e836d196e888 -r f425b578ede7 eric6/ThirdParty/CharDet/chardet/cli/chardetect.py
--- a/eric6/ThirdParty/CharDet/chardet/cli/chardetect.py Wed Jan 13 19:02:58 2021 +0100
+++ b/eric6/ThirdParty/CharDet/chardet/cli/chardetect.py Wed Jan 13 19:05:48 2021 +0100
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
"""
Script which takes one or more file paths and reports on their detected
encodings
@@ -17,9 +16,9 @@
import argparse
import sys
-from io import open
from chardet import __version__
+from chardet.compat import PY2
from chardet.universaldetector import UniversalDetector
@@ -35,36 +34,41 @@
"""
u = UniversalDetector()
for line in lines:
+ line = bytearray(line)
u.feed(line)
+ # shortcut out of the loop to save reading further - particularly useful if we read a BOM.
+ if u.done:
+ break
u.close()
result = u.result
+ if PY2:
+ name = name.decode(sys.getfilesystemencoding(), 'ignore')
if result['encoding']:
- return '{0}: {1} with confidence {2}'.format(name, result['encoding'],
+ return '{}: {} with confidence {}'.format(name, result['encoding'],
result['confidence'])
else:
- return '{0}: no result'.format(name)
+ return '{}: no result'.format(name)
def main(argv=None):
- '''
+ """
Handles command line arguments and gets things started.
:param argv: List of arguments, as if specified on the command-line.
If None, ``sys.argv[1:]`` is used instead.
:type argv: list of str
- '''
+ """
# Get command line arguments
parser = argparse.ArgumentParser(
description="Takes one or more file paths and reports their detected \
- encodings",
- formatter_class=argparse.ArgumentDefaultsHelpFormatter,
- conflict_handler='resolve')
+ encodings")
parser.add_argument('input',
- help='File whose encoding we would like to determine.',
+ help='File whose encoding we would like to determine. \
+ (default: stdin)',
type=argparse.FileType('rb'), nargs='*',
- default=[sys.stdin])
+ default=[sys.stdin if PY2 else sys.stdin.buffer])
parser.add_argument('--version', action='version',
- version='%(prog)s {0}'.format(__version__))
+ version='%(prog)s {}'.format(__version__))
args = parser.parse_args(argv)
for f in args.input:
