From 04737b3e854177a549b378d3befcebb54a29fe74 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 8 Aug 2018 10:06:07 -0500 Subject: [PATCH] Update included_dependencies to chardet-3.0.4 --- .../chardet/universaldetector.py | 20 +++++++++++++------ included_dependencies/chardet/version.py | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/included_dependencies/chardet/universaldetector.py b/included_dependencies/chardet/universaldetector.py index b3c057e8..7b4e92d6 100644 --- a/included_dependencies/chardet/universaldetector.py +++ b/included_dependencies/chardet/universaldetector.py @@ -40,6 +40,7 @@ import codecs import logging import re +from .charsetgroupprober import CharSetGroupProber from .enums import InputState, LanguageFilter, ProbingState from .escprober import EscCharSetProber from .latin1prober import Latin1Prober @@ -268,11 +269,18 @@ class UniversalDetector(object): if self.logger.getEffectiveLevel() == logging.DEBUG: if self.result['encoding'] is None: self.logger.debug('no probers hit minimum threshold') - for prober in self._charset_probers[0].probers: - if not prober: + for group_prober in self._charset_probers: + if not group_prober: continue - self.logger.debug('%s %s confidence = %s', - prober.charset_name, - prober.language, - prober.get_confidence()) + if isinstance(group_prober, CharSetGroupProber): + for prober in group_prober.probers: + self.logger.debug('%s %s confidence = %s', + prober.charset_name, + prober.language, + prober.get_confidence()) + else: + self.logger.debug('%s %s confidence = %s', + prober.charset_name, + prober.language, + prober.get_confidence()) return self.result diff --git a/included_dependencies/chardet/version.py b/included_dependencies/chardet/version.py index f29337ca..bb2a34a7 100644 --- a/included_dependencies/chardet/version.py +++ b/included_dependencies/chardet/version.py @@ -5,5 +5,5 @@ from within setup.py and from chardet subpackages. :author: Dan Blanchard (dan.blanchard@gmail.com) """ -__version__ = "3.0.2" +__version__ = "3.0.4" VERSION = __version__.split('.')