[tryton-debian-vcs] tryton-client branch debian-stretch-3.6 updated. debian/3.6.19-1-2-g954f064

[Mathias Behrle]

The following commit has been merged in the debian-stretch-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.6.19-1-2-g954f064

commit 954f0648f813e7637b778a90113b086a5bf219e6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Nov 11 14:35:58 2017 +0100

    Releasing debian version 3.6.20-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index c828179..4bb4830 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.6.20-1) unstable; urgency=medium
+
+  * Merging upstream version 3.6.20.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 11 Nov 2017 14:35:58 +0100
+
 tryton-client (3.6.19-1) unstable; urgency=medium
 
   * Merging upstream version 3.6.19.
commit b15bc595f4250e7837393a87276063e34439c0b8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Nov 11 14:35:58 2017 +0100

    Merging upstream version 3.6.20.

diff --git a/CHANGELOG b/CHANGELOG
index b2a3e07..ce15e2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.20 - 2017-11-07
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.19 - 2017-10-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index ec89304..93c0130 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.6.19
+Version: 3.6.20
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index ec89304..93c0130 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.6.19
+Version: 3.6.20
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.egg-info/SOURCES.txt b/tryton.egg-info/SOURCES.txt
index 7ef7058..35abb7e 100644
--- a/tryton.egg-info/SOURCES.txt
+++ b/tryton.egg-info/SOURCES.txt
@@ -1,3 +1,4 @@
+.hgtags
 CHANGELOG
 COPYRIGHT
 INSTALL
diff --git a/tryton/__init__.py b/tryton/__init__.py
index d90e8b4..17ae79b 100644
--- a/tryton/__init__.py
+++ b/tryton/__init__.py
@@ -1,3 +1,3 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-__version__ = "3.6.19"
+__version__ = "3.6.20"
diff --git a/tryton/common/domain_parser.py b/tryton/common/domain_parser.py
index d8dbe2b..e01a0bf 100644
--- a/tryton/common/domain_parser.py
+++ b/tryton/common/domain_parser.py
@@ -626,10 +626,10 @@ def test_format_datetime():
         'format': '"%H:%M:%S"',
         }
     for value, result in (
-            (datetime.date(2002, 12, 4), '12/04/02'),
-            (datetime.datetime(2002, 12, 4), '12/04/02'),
+            (datetime.date(2002, 12, 4), '12/04/2002'),
+            (datetime.datetime(2002, 12, 4), '12/04/2002'),
             (untimezoned_date(datetime.datetime(2002, 12, 4, 12, 30)),
-                '"12/04/02 12:30:00"'),
+                '"12/04/2002 12:30:00"'),
             (False, ''),
             (None, ''),
             ):
@@ -641,7 +641,7 @@ def test_format_date():
         'type': 'date',
         }
     for value, result in (
-            (datetime.date(2002, 12, 4), '12/04/02'),
+            (datetime.date(2002, 12, 4), '12/04/2002'),
             (False, ''),
             (None, ''),
             ):
@@ -686,7 +686,7 @@ def complete_value(field, value):
     def complete_selection():
         test_value = value if value is not None else ''
         if isinstance(value, list):
-            test_value = value[-1]
+            test_value = value[-1] or ''
         test_value = test_value.strip('%')
         for svalue, test in field['selection']:
             if test.lower().startswith(test_value.lower()):
@@ -742,6 +742,7 @@ def test_complete_selection():
             ('', ['male', 'female']),
             (None, ['male', 'female']),
             (['male', 'f'], [['male', 'female']]),
+            (['male', None], [['male', 'male'], ['male', 'female']]),
             ):
         assert list(complete_value(field, value)) == result
 
@@ -1261,7 +1262,7 @@ def test_string():
     assert dom.string([]) == ''
     assert dom.string([('surname', 'ilike', '%Doe%')]) == '"(Sur)Name": Doe'
     assert dom.string([('date', '>=', datetime.date(2012, 10, 24))]) == \
-        'Date: >=10/24/12'
+        'Date: >=10/24/2012'
     assert dom.string([('selection', '=', '')]) == 'Selection: '
     assert dom.string([('selection', '=', None)]) == 'Selection: '
     assert dom.string([('selection', '!=', '')]) == 'Selection: !""'
diff --git a/tryton/config.py b/tryton/config.py
index a71b8ab..0f55037 100644
--- a/tryton/config.py
+++ b/tryton/config.py
@@ -26,7 +26,10 @@ def get_home_dir():
 
 def get_config_dir():
     if os.name == 'nt':
-        return os.path.join(os.environ['APPDATA'], '.config', 'tryton',
+        appdata = os.environ['APPDATA']
+        if not isinstance(appdata, unicode):
+            appdata = unicode(appdata, sys.getfilesystemencoding())
+        return os.path.join(appdata, '.config', 'tryton',
                 __version__.rsplit('.', 1)[0])
     return os.path.join(os.environ['HOME'], '.config', 'tryton',
             __version__.rsplit('.', 1)[0])
-- 
tryton-client