Skip to content

Commit

Permalink
Merge pull request #117 from chardet/fix/debug_logging_empty_string
Browse files Browse the repository at this point in the history
Fix crash when debug logging is enabled and passed empty string
  • Loading branch information
dan-blanchard committed Apr 18, 2017
2 parents c47f6d7 + 2f8b6d3 commit 3474dc4
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions chardet/universaldetector.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class a user of ``chardet`` should use.
import logging
import re

from .charsetgroupprober import CharSetGroupProber
from .enums import InputState, LanguageFilter, ProbingState
from .escprober import EscCharSetProber
from .latin1prober import Latin1Prober
Expand Down Expand Up @@ -268,11 +269,18 @@ def close(self):
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

0 comments on commit 3474dc4

Please sign in to comment.