tryton 7.0.21__py3-none-any.whl → 7.2.0__py3-none-any.whl

tryton/gui/window/wizard.py

@@ -150,16 +150,17 @@ class Wizard(InfoBar):
 
     def end(self, callback=None):
         def end_callback(action):
-            self.destroy(action=action())
-            if callback:
-                callback()
-        try:
-            RPCExecute('wizard', self.action, 'delete', self.session_id,
-                process_exception=False, callback=end_callback)
-        except Exception:
-            logger.warn(
-                "Unable to delete session %s of wizard %s",
-                self.session_id, self.action, exc_info=True)
+            try:
+                self.destroy(action=action())
+                if callback:
+                    callback()
+            except RPCException:
+                logger.warn(
+                    "Unable to delete session %s of wizard %s",
+                    self.session_id, self.action, exc_info=True)
+        RPCExecute(
+            'wizard', self.action, 'delete', self.session_id,
+            process_exception=False, callback=end_callback)
 
     def clean(self):
         for widget in self.widget.get_children():

tryton/jsonrpc.py

@@ -3,6 +3,7 @@
 import base64
 import datetime
 import errno
+import gettext
 import hashlib
 import http.client
 import json
@@ -11,17 +12,20 @@ import socket
 import ssl
 import threading
 import xmlrpc.client
-from collections import defaultdict
 from contextlib import contextmanager
 from decimal import Decimal
 from functools import partial, reduce
 from urllib.parse import quote, urljoin
 
+from .cache import CacheDict
+from .config import CONFIG
+
 __all__ = ["ResponseError", "Fault", "ProtocolError", "Transport",
     "ServerProxy", "ServerPool"]
 CONNECT_TIMEOUT = 5
 DEFAULT_TIMEOUT = None
 logger = logging.getLogger(__name__)
+_ = gettext.gettext
 
 
 def deepcopy(obj):
@@ -193,34 +197,38 @@ class Transport(xmlrpc.client.SafeTransport):
         ssl_ctx = ssl.create_default_context(cafile=self.__ca_certs)
 
         def http_connection():
-            self._connection = host, http.client.HTTPConnection(chost,
-                timeout=CONNECT_TIMEOUT)
-            self._connection[1].connect()
-            sock = self._connection[1].sock
-            sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+            connection = http.client.HTTPConnection(
+                chost, timeout=CONNECT_TIMEOUT)
+            self._connection = host, connection
+            connection.connect()
+            sock = connection.sock
+            if sock:
+                sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+            return connection
 
         def https_connection(allow_http=False):
-            self._connection = host, http.client.HTTPSConnection(chost,
-                timeout=CONNECT_TIMEOUT, context=ssl_ctx)
+            connection = http.client.HTTPSConnection(
+                chost, timeout=CONNECT_TIMEOUT, context=ssl_ctx)
+            self._connection = host, connection
             try:
-                self._connection[1].connect()
-                sock = self._connection[1].sock
-                sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-                sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
-                try:
-                    peercert = sock.getpeercert(True)
-                except socket.error:
-                    peercert = None
+                connection.connect()
+                sock = connection.sock
+                if sock:
+                    sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+                    try:
+                        peercert = sock.getpeercert(True)
+                    except socket.error:
+                        peercert = None
 
                 def format_hash(value):
                     return reduce(lambda x, y: x + y[1].upper()
                         + ((y[0] % 2 and y[0] + 1 < len(value)) and ':' or ''),
                         enumerate(value), '')
-                return format_hash(hashlib.sha1(peercert).hexdigest())
+                return connection, format_hash(
+                    hashlib.sha1(peercert).hexdigest())
             except (socket.error, ssl.SSLError, ssl.CertificateError):
                 if allow_http:
-                    http_connection()
+                    return http_connection(), None
                 else:
                     raise
 
@@ -228,17 +236,19 @@ class Transport(xmlrpc.client.SafeTransport):
         if (self.__fingerprints is not None
                 and self.__fingerprints.exists(chost)):
             if self.__fingerprints.get(chost):
-                fingerprint = https_connection()
+                connection, fingerprint = https_connection()
             else:
-                http_connection()
+                connection = http_connection()
         else:
-            fingerprint = https_connection(allow_http=True)
+            connection, fingerprint = https_connection(allow_http=True)
 
         if self.__fingerprints is not None:
             self.__fingerprints.set(chost, fingerprint)
-        self._connection[1].timeout = DEFAULT_TIMEOUT
-        self._connection[1].sock.settimeout(DEFAULT_TIMEOUT)
-        return self._connection[1]
+        connection.timeout = DEFAULT_TIMEOUT
+        sock = connection.sock
+        if sock:
+            sock.settimeout(DEFAULT_TIMEOUT)
+        return connection
 
     @property
     def encode_threshold(self):
@@ -302,7 +312,8 @@ class ServerProxy(xmlrpc.client.ServerProxy):
             self.__transport.close()
             raise
         if response['id'] != id_:
-            raise ResponseError('Invalid response id (%s) excpected %s' %
+            raise ResponseError(
+                _("Invalid response id (%s) expected %s") %
                 (response['id'], id_))
         if response.get('error'):
             raise Fault(*response['error'])
@@ -396,7 +407,10 @@ class ServerPool(object):
 class _Cache:
 
     def __init__(self):
-        self.store = defaultdict(dict)
+        cache_size = CONFIG['rpc.cache_size']
+        self.store = CacheDict(
+            cache_len=cache_size,
+            default_factory=lambda: CacheDict(cache_len=cache_size))
 
     def cached(self, prefix):
         return prefix in self.store

tryton/pyson.py

@@ -9,6 +9,8 @@ from dateutil.relativedelta import relativedelta
 
 
 class PYSON(object):
+    _operator = None
+    _binary_operator = None
 
     def pyson(self):
         raise NotImplementedError
@@ -81,8 +83,17 @@ class PYSON(object):
         return In(k, self)
 
     def __repr__(self):
-        klass = self.__class__.__name__
-        return '%s(%s)' % (klass, ', '.join(map(repr, self.__repr_params__)))
+        params = self.__repr_params__
+        if self._operator and isinstance(params[0], PYSON):
+            return '%s.%s(%s)' % (
+                repr(params[0]), self._operator,
+                ', '.join(map(repr, params[1:])))
+        elif self._binary_operator and isinstance(params[0], PYSON):
+            return '(%s %s %s)' % (
+                repr(params[0]), self._binary_operator, repr(params[1]))
+        else:
+            klass = self.__class__.__name__
+            return '%s(%s)' % (klass, ', '.join(map(repr, params)))
 
     @property
     def __repr_params__(self):
@@ -137,7 +148,10 @@ class Eval(PYSON):
 
     @property
     def __repr_params__(self):
-        return self._value, self._default
+        params = (self._value,)
+        if self._default != '':
+            params += (self._default,)
+        return params
 
     def pyson(self):
         return {
@@ -183,6 +197,17 @@ class Not(PYSON):
             v = bool(v)
         self._value = v
 
+    def __repr__(self):
+        if (isinstance(self._value, Equal)
+                and isinstance(self._value._statement1, PYSON)):
+            return '(%s != %s)' % (
+                repr(self._value._statement1),
+                repr(self._value._statement2))
+        elif isinstance(self._value, PYSON):
+            return '~%s' % repr(self._value)
+        else:
+            return super().__repr__()
+
     @property
     def __repr_params__(self):
         return (self._value,)
@@ -226,6 +251,8 @@ class Bool(PYSON):
 
 
 class And(PYSON):
+    _pyson_class = 'And'
+    _binary_operator = '&'
 
     def __init__(self, *statements, **kwargs):
         super(And, self).__init__()
@@ -258,6 +285,7 @@ class And(PYSON):
 
 
 class Or(And):
+    _binary_operator = '|'
 
     def pyson(self):
         res = super(Or, self).pyson()
@@ -270,6 +298,7 @@ class Or(And):
 
 
 class Equal(PYSON):
+    _binary_operator = '=='
 
     def __init__(self, s1, s2):
         statement1, statement2 = s1, s2
@@ -332,6 +361,10 @@ class Greater(PYSON):
         self._statement2 = statement2
         self._equal = equal
 
+    @property
+    def _binary_operator(self):
+        return '<=' if self._equal else '<'
+
     @property
     def __repr_params__(self):
         return (self._statement1, self._statement2, self._equal)
@@ -378,6 +411,10 @@ class Greater(PYSON):
 
 class Less(Greater):
 
+    @property
+    def _binary_operator(self):
+        return '>=' if self._equal else '>'
+
     def pyson(self):
         res = super(Less, self).pyson()
         res['__class__'] = 'Less'
@@ -440,6 +477,7 @@ class If(PYSON):
 
 
 class Get(PYSON):
+    _operator = 'get'
 
     def __init__(self, v, k, d=''):
         obj, key, default = v, k, d
@@ -458,7 +496,10 @@ class Get(PYSON):
 
     @property
     def __repr_params__(self):
-        return (self._obj, self._key, self._default)
+        params = (self._obj, self._key)
+        if self._default != '':
+            params += (self._default,)
+        return params
 
     def pyson(self):
         return {
@@ -480,6 +521,7 @@ class Get(PYSON):
 
 
 class In(PYSON):
+    _operator = 'in_'
 
     def __init__(self, k, v):
         key, obj = k, v
@@ -508,6 +550,14 @@ class In(PYSON):
         self._key = key
         self._obj = obj
 
+    def __repr__(self):
+        params = self.__repr_params__
+        if isinstance(params[1], PYSON):
+            return '%s.contains(%s)' % (
+                repr(params[1]), ', '.join(map(repr, params[:1] + params[2:])))
+        else:
+            return super().__repr__()
+
     @property
     def __repr_params__(self):
         return (self._key, self._obj)

tryton/rpc.py

@@ -145,6 +145,24 @@ def logout():
     _USER = None
 
 
+def reset_password():
+    from tryton import common
+    host = CONFIG['login.host']
+    hostname = common.get_hostname(host)
+    port = common.get_port(host)
+    database = CONFIG['login.db']
+    username = CONFIG['login.login']
+    language = CONFIG['client.lang']
+    if not all([host, database, username]):
+        return
+    try:
+        connection = ServerProxy(hostname, port, database)
+        logger.info('common.db.reset_password(%s, %s)', (username, language))
+        connection.common.db.reset_password(username, language)
+    except Fault as exception:
+        logger.debug(exception.faultCode)
+
+
 def execute(*args):
     global CONNECTION, _USER
     if CONNECTION is None:

tryton/tests/test_common_domain_parser.py

@@ -592,8 +592,6 @@ class DomainParserTestCase(TestCase):
                 })
         valid = ('name', '=', 'Doe')
         invalid = ('surname', '=', 'John')
-        self.assertTrue(dom.stringable([]))
-        self.assertTrue(dom.stringable([[]]))
         self.assertTrue(dom.stringable([valid]))
         self.assertFalse(dom.stringable([invalid]))
         self.assertTrue(dom.stringable(['AND', valid]))
@@ -681,15 +679,9 @@ class DomainParserTestCase(TestCase):
             dom.string([('name', 'not ilike', '%Doe%')]), 'Name: !Doe')
         self.assertEqual(
             dom.string([('name', 'in', ['John', 'Jane'])]), 'Name: John;Jane')
-        self.assertEqual(
-            dom.string([('name', 'in', ['John', ''])]), 'Name: John;""')
-        self.assertEqual(
-            dom.string([('name', 'in', ['John'])]), 'Name: =John')
         self.assertEqual(
             dom.string([('name', 'not in', ['John', 'Jane'])]),
             'Name: !John;Jane')
-        self.assertEqual(
-            dom.string([('name', 'not in', ['John'])]), 'Name: !=John')
         self.assertEqual(
             dom.string([
                     ('name', 'ilike', '%Doe%'),

{tryton-7.0.21.data → tryton-7.2.0.data}/scripts/tryton

@@ -15,8 +15,7 @@ if hasattr(sys, 'frozen'):
     share = os.path.join(prefix, 'share')
     os.environ['GTK_EXE_PREFIX'] = prefix
     os.environ['GTK_DATA_PREFIX'] = prefix
-    os.environ['EV_BACKENDS_DIR'] = os.path.join(
-        prefix, 'lib', 'evince', '4', 'backends')
+    os.environ['EV_BACKENDS_DIR'] = prefix
     os.environ['XDG_DATA_DIRS'] = share
     os.environ['GDK_PIXBUF_MODULE_FILE'] = os.path.join(
             share, 'gtk-3.0', 'gdk-pixbuf.loaders')

{tryton-7.0.21.dist-info → tryton-7.2.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: tryton
-Version: 7.0.21
+Version: 7.2.0
 Summary: Tryton desktop client
 Home-page: http://www.tryton.org/
-Download-URL: http://downloads.tryton.org/7.0/
+Download-URL: http://downloads.tryton.org/7.2/
 Author: Tryton
 Author-email: foundation@tryton.org
 License: GPL-3
@@ -52,25 +52,11 @@ Requires-Python: >=3.8
 License-File: LICENSE
 Requires-Dist: pycairo
 Requires-Dist: python-dateutil
-Requires-Dist: PyGObject>=3.19
+Requires-Dist: PyGObject >=3.19
 Provides-Extra: calendar
-Requires-Dist: GooCalendar>=0.7; extra == "calendar"
+Requires-Dist: GooCalendar >=0.7 ; extra == 'calendar'
 Provides-Extra: sound
-Requires-Dist: playsound; extra == "sound"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: download-url
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: platform
-Dynamic: project-url
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
+Requires-Dist: playsound ; extra == 'sound'
 
 tryton
 ======