X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_lib%2Fdefenc.py;h=776b78dabb0eb428f51baaae01d4e58958cc8540;hb=c0a3ca4a622dadfa767404da3c366443bab0f791;hp=01d899058295b87c25a91d786fda45ac1a94b40e;hpb=d7c459a9f979c4978cf07ff11056512a852fd61d;p=m_lib.git

diff --git a/m_lib/defenc.py b/m_lib/defenc.py
index 01d8990..776b78d 100755
--- a/m_lib/defenc.py
+++ b/m_lib/defenc.py
@@ -1,11 +1,7 @@
 #! /usr/bin/env python
-"""Get default encoding
-
-   Written by Oleg Broytman. Copyright (C) 2007, 2008 PhiloSoft Design.
-"""
-
-__all__ = ['default_encoding']
+"""Get default encoding"""
 
+from __future__ import print_function
 import sys
 
 try:
@@ -14,21 +10,23 @@ try:
 except ImportError:
    use_locale = False
 
+__all__ = ['default_encoding']
+
 if use_locale:
    # Get the default charset.
    try:
       lcAll = locale.getdefaultlocale()
-   except locale.Error, err:
-      print >>sys.stderr, "WARNING:", err
+   except locale.Error as err:
+      print("WARNING:", err, file=sys.stderr)
       lcAll = []
 
-   if len(lcAll) == 2:
+   if len(lcAll) == 2 and lcAll[0] is not None:
       default_encoding = lcAll[1]
    else:
       try:
          default_encoding = locale.getpreferredencoding()
-      except locale.Error, err:
-         print >>sys.stderr, "WARNING:", err
+      except locale.Error as err:
+         print("WARNING:", err, file=sys.stderr)
          default_encoding = sys.getdefaultencoding()
 else:
    default_encoding = sys.getdefaultencoding()
@@ -36,4 +34,4 @@ else:
 default_encoding = default_encoding.lower()
 
 if __name__ == "__main__":
-   print default_encoding
+   print(default_encoding)