move guess_encoding into weboob.tools.misc

weboob/tools/application/base.py

@@ -24,7 +24,6 @@ import logging
 import optparse
 from optparse import OptionGroup, OptionParser
 from datetime import datetime
-import locale
 import os
 import sys
 import warnings
@@ -35,7 +34,7 @@ from weboob.core.backendscfg import BackendsConfig
 from weboob.tools.config.iconfig import ConfigError
 from weboob.exceptions import FormFieldConversionWarning
 from weboob.tools.log import createColoredFormatter, getLogger, DEBUG_FILTERS, settings as log_settings
-from weboob.tools.misc import to_unicode
+from weboob.tools.misc import to_unicode, guess_encoding
 from .results import ResultsConditionError
 
 __all__ = ['Application']
@@ -175,16 +174,7 @@ class Application(object):
         self._is_default_count = True
 
     def guess_encoding(self, stdio=None):
-        if stdio is None:
+        return guess_encoding(stdio or self.stdout)
-            stdio = self.stdout
-        try:
-            encoding = stdio.encoding or locale.getpreferredencoding()
-        except AttributeError:
-            encoding = None
-        # ASCII or ANSII is most likely a user mistake
-        if not encoding or encoding.lower() == 'ascii' or encoding.lower().startswith('ansi'):
-            encoding = 'UTF-8'
-        return encoding
 
     def deinit(self):
         self.weboob.want_stop()

weboob/tools/misc.py

@@ -19,6 +19,7 @@
 
 
 from time import time, sleep
+import locale
 import os
 import sys
 import traceback
@@ -92,6 +93,17 @@ def to_unicode(text):
             return unicode(text, 'windows-1252', 'replace')
 
 
+def guess_encoding(stdio):
+    try:
+        encoding = stdio.encoding or locale.getpreferredencoding()
+    except AttributeError:
+        encoding = None
+    # ASCII or ANSII is most likely a user mistake
+    if not encoding or encoding.lower() == 'ascii' or encoding.lower().startswith('ansi'):
+        encoding = 'UTF-8'
+    return encoding
+
+
 def limit(iterator, lim):
     count = 0
     iterator = iter(iterator)