From: Oleg Broytman <phd@phdru.name>
Date: Wed, 30 Mar 2016 17:41:31 +0000 (+0300)
Subject: Fix a bug in getting default_encoding
X-Git-Tag: 2.1.3~4
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=c5dac7ecae12952f2510f4418b44592807d30d75;p=m_lib.git

Fix a bug in getting default_encoding

Release version 2.1.2.
---

diff --git a/m_lib/defenc.py b/m_lib/defenc.py
index 01d8990..edcd80b 100755
--- a/m_lib/defenc.py
+++ b/m_lib/defenc.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 """Get default encoding
 
-   Written by Oleg Broytman. Copyright (C) 2007, 2008 PhiloSoft Design.
+   Written by Oleg Broytman. Copyright (C) 2007-2016 PhiloSoft Design.
 """
 
 __all__ = ['default_encoding']
@@ -22,7 +22,7 @@ if use_locale:
       print >>sys.stderr, "WARNING:", err
       lcAll = []
 
-   if len(lcAll) == 2:
+   if len(lcAll) == 2 and lcAll[0] is not None:
       default_encoding = lcAll[1]
    else:
       try:
diff --git a/setup.py b/setup.py
index 4b66dbf..9609969 100755
--- a/setup.py
+++ b/setup.py
@@ -18,9 +18,9 @@ if is_setuptools:
         }
 
 setup(name = "m_lib",
-    version = "2.1.1",
+    version = "2.1.2",
     description = "Broytman Library for Python",
-    long_description = "Broytman Library for Python, Copyright (C) 1996-2013 PhiloSoft Design",
+    long_description = "Broytman Library for Python, Copyright (C) 1996-2016 PhiloSoft Design",
     author = "Oleg Broytman",
     author_email = "phd@phdru.name",
     url = "http://phdru.name/Software/Python/#m_lib",