[tryton-debian-vcs] tryton-client branch debian-jessie-3.2 updated. debian/3.2.13-1-3-g2a21a73

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Tue Mar 15 20:34:51 UTC 2016


The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.2.13-1-3-g2a21a73

commit 2a21a73a14a82b45cf3d388d72e07a4aca0518a7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 15 20:30:13 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 94cd35a..1ddde95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-client (3.2.14-1) unstable; urgency=medium
+
+  * Updating signing-key.asc with the actual upstream maintainer keys.
+  * Merging upstream version 3.2.14.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 15 Mar 2016 20:30:13 +0100
+
 tryton-client (3.2.13-1) unstable; urgency=medium
 
   * Merging upstream version 3.2.13.
commit 2f9e9fc48afd1db3b25dc0071f695059a51039c6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 15 20:30:13 2016 +0100

    Merging upstream version 3.2.14.

diff --git a/CHANGELOG b/CHANGELOG
index 05d2400..2941e7a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.14 - 2016-03-14
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.13 - 2016-02-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 2024360..86789df 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.2.13
+Version: 3.2.14
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.nsi b/setup.nsi
index 6bfd7f7..7efdcd4 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -55,10 +55,10 @@ Var STARTMENU_FOLDER
 
 ;Languages
 
+!insertmacro MUI_LANGUAGE "English" ; First is the default
+!include "english.nsh"
 !insertmacro MUI_LANGUAGE "Catalan"
 !include "catalan.nsh"
-!insertmacro MUI_LANGUAGE "English"
-!include "english.nsh"
 !insertmacro MUI_LANGUAGE "French"
 !include "french.nsh"
 !insertmacro MUI_LANGUAGE "German"
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 2024360..86789df 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.2.13
+Version: 3.2.14
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/common/domain_parser.py b/tryton/common/domain_parser.py
index 62b8dce..14ea502 100644
--- a/tryton/common/domain_parser.py
+++ b/tryton/common/domain_parser.py
@@ -887,10 +887,14 @@ class DomainParser(object):
                         operator = '!'
                     value = value.replace('%%', '%')
             def_operator = default_operator(field)
-            if (def_operator == operator.strip()
-                    or (def_operator in operator
-                        and ('not' in operator
-                            or '!' in operator))):
+            if def_operator == operator.strip():
+                operator = ''
+                if value in OPERATORS:
+                    # As the value could be interpreted as an operator,
+                    # the default operator must be forced
+                    operator = '"" '
+            elif (def_operator in operator
+                    and ('not' in operator or '!' in operator)):
                 operator = operator.rstrip(def_operator
                     ).replace('not', '!').strip()
             if operator.endswith('in'):
@@ -986,7 +990,7 @@ class DomainParser(object):
             field = self.fields[name]
         else:
             field = self.strings[name.lower()]
-        if operator is None:
+        if not operator:
             operator = default_operator(field)
             value = ''
             if 'ilike' in operator:
@@ -1015,7 +1019,9 @@ class DomainParser(object):
                     else:
                         yield (None,)
                     name = (name,)
-                    if i + 1 < len(parts) and parts[i + 1] in OPERATORS:
+                    # empty string is also the default operator
+                    if (i + 1 < len(parts)
+                            and parts[i + 1] in OPERATORS + ('',)):
                         name += (parts[i + 1],)
                         i += 1
                     else:
@@ -1080,7 +1086,7 @@ class DomainParser(object):
                         if target:
                             field_name += '.rec_name'
 
-                    if operator is None:
+                    if not operator:
                         operator = default_operator(field)
                     if isinstance(value, list):
                         if operator == '!':
@@ -1174,6 +1180,7 @@ def test_string():
     assert dom.string([('name', '=', '')]) == 'Name: =""'
     assert dom.string([('name', 'ilike', '%')]) == 'Name: '
     assert dom.string([('name', 'ilike', '%Doe%')]) == 'Name: Doe'
+    assert dom.string([('name', 'ilike', '%<%')]) == 'Name: "" "<"'
     assert dom.string([('name', 'ilike', 'Doe')]) == 'Name: =Doe'
     assert dom.string([('name', 'ilike', 'Doe%')]) == 'Name: Doe%'
     assert dom.string([('name', 'ilike', 'Doe%%')]) == 'Name: =Doe%'
@@ -1302,6 +1309,9 @@ def test_group():
     assert rlist(dom.group(udlex(u'Name: \\"foo\\"'))) == [
         ('Name', None, '"foo"'),
         ]
+    assert rlist(dom.group(udlex(u'Name: "" <'))) == [
+        ('Name', '', '<'),
+        ]
 
 
 def test_parse_clause():
@@ -1344,6 +1354,8 @@ def test_parse_clause():
         ('rec_name', 'ilike', '%John%')]
     assert rlist(dom.parse_clause([('Name', None, None)])) == [
         ('name', 'ilike', '%')]
+    assert rlist(dom.parse_clause([('Name', '', None)])) == [
+        ('name', 'ilike', '%')]
     assert rlist(dom.parse_clause([('Name', '=', None)])) == [
         ('name', '=', None)]
     assert rlist(dom.parse_clause([('Name', '=', '')])) == [
diff --git a/tryton/version.py b/tryton/version.py
index 7e63eb0..907d267 100644
--- a/tryton/version.py
+++ b/tryton/version.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "tryton"
-VERSION = "3.2.13"
+VERSION = "3.2.14"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client



More information about the tryton-debian-vcs mailing list