Commits

Anonymous committed 0ab0713

hachoir_core.i18n: Fix initLocale(), return the charset if it was already called once

Comments (0)

Files changed (1)

hachoir-core/hachoir_core/i18n.py

 
 def initLocale():
     # Only initialize locale once
-    try:
-        if initLocale.is_done:
-            return
-    except AttributeError:
-        pass
+    if initLocale.is_done:
+        return getTerminalCharset()
     initLocale.is_done = True
 
     # Setup locales
         sys.stdout = UnicodeStdout(sys.stdout, charset)
         sys.stderr = UnicodeStdout(sys.stderr, charset)
     return charset
+initLocale.is_done = False
 
 def _dummy_gettext(text):
     return unicode(text)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.