helpers: unicode/str add flag to control usage of chardet.

- in case it's somehow installed we still want to control the behaviour via explicit flag.

rhodecode/lib/utils2.py

@@ -207,7 +207,7 b' def safe_int(val, default=None):'
     return val
 
 
-def safe_unicode(str_, from_encoding=None):
+def safe_unicode(str_, from_encoding=None, use_chardet=False):
     """
     safe unicode function. Does few trick to turn str_ into unicode
 
@@ -240,6 +240,7 b' def safe_unicode(str_, from_encoding=Non'
         except UnicodeDecodeError:
             pass
 
+    if use_chardet:
     try:
         import chardet
         encoding = chardet.detect(str_)['encoding']
@@ -248,9 +249,10 b' def safe_unicode(str_, from_encoding=Non'
         return str_.decode(encoding)
     except (ImportError, UnicodeDecodeError, Exception):
         return unicode(str_, from_encoding[0], 'replace')
-
+    else:
+        return unicode(str_, from_encoding[0], 'replace')
 
-def safe_str(unicode_, to_encoding=None):
+def safe_str(unicode_, to_encoding=None, use_chardet=False):
     """
     safe str function. Does few trick to turn unicode_ into string
 
@@ -283,6 +285,7 b' def safe_str(unicode_, to_encoding=None)'
         except UnicodeEncodeError:
             pass
 
+    if use_chardet:
     try:
         import chardet
         encoding = chardet.detect(unicode_)['encoding']
@@ -292,6 +295,8 b' def safe_str(unicode_, to_encoding=None)'
         return unicode_.encode(encoding)
     except (ImportError, UnicodeEncodeError):
         return unicode_.encode(to_encoding[0], 'replace')
+    else:
+        return unicode_.encode(to_encoding[0], 'replace')
 
 
 def remove_suffix(s, suffix):