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

tryton/__init__.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.
-__version__ = "7.0.21"
+__version__ = "7.2.0"
 import locale
 
 import gi

tryton/cache.py

@@ -0,0 +1,34 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+from collections import OrderedDict
+
+
+class CacheDict(OrderedDict):
+
+    def __init__(self, *args, cache_len=10, default_factory=None, **kwargs):
+        assert cache_len > 0
+        self.cache_len = cache_len
+        self.default_factory = default_factory
+
+        super().__init__(*args, **kwargs)
+
+    def __setitem__(self, key, value):
+        super().__setitem__(key, value)
+        self.move_to_end(key)
+
+        while len(self) > self.cache_len:
+            oldkey = next(iter(self))
+            self.__delitem__(oldkey)
+
+    def __getitem__(self, key):
+        value = super().__getitem__(key)
+        self.move_to_end(key)
+        return value
+
+    def __missing__(self, key):
+        if self.default_factory is None:
+            raise KeyError(key)
+        value = self.default_factory()
+        self[key] = value
+        return value

tryton/common/common.py

@@ -1,7 +1,9 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 
+import base64
 import colorsys
+import concurrent.futures
 import gettext
 import locale
 import logging
@@ -9,10 +11,9 @@ import os
 import platform
 import re
 import subprocess
-import tempfile
 import unicodedata
 import xml.etree.ElementTree as ET
-from collections import defaultdict
+from collections import OrderedDict, defaultdict
 from decimal import Decimal
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from pathlib import PurePath
@@ -31,11 +32,12 @@ import urllib.error
 import urllib.parse
 import urllib.request
 import webbrowser
-from functools import lru_cache, wraps
+from functools import wraps
 from string import Template
 from threading import Lock, Thread
 
 import tryton.rpc as rpc
+from tryton.cache import CacheDict
 from tryton.config import CONFIG, PIXMAPS_DIR, SOUNDS_DIR, TRYTON_ICON
 
 try:
@@ -50,6 +52,7 @@ from tryton import __version__
 from tryton.exceptions import TrytonError, TrytonServerError
 from tryton.pyson import PYSONEncoder
 
+from . import tempfile
 from .underline import set_underline
 from .widget_style import widget_class
 
@@ -60,11 +63,15 @@ logger = logging.getLogger(__name__)
 class IconFactory:
 
     batchnum = 10
-    _tryton_icons = []
-    _name2id = {}
+    _name2id = OrderedDict()
     _icons = {}
     _local_icons = {}
     _pixbufs = defaultdict(dict)
+    _url_pixbufs = CacheDict(cache_len=CONFIG['image.cache_size'])
+    _empty_pixbufs = {}
+    _empty_gif = base64.b64decode(
+        'R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7')
+    _executor = concurrent.futures.ThreadPoolExecutor(max_workers=5)
 
     @classmethod
     def load_local_icons(cls):
@@ -75,69 +82,61 @@ class IconFactory:
 
     @classmethod
     def load_icons(cls, refresh=False):
-        if not refresh:
-            cls._name2id.clear()
-            cls._icons.clear()
-        del cls._tryton_icons[:]
-
         try:
             icons = rpc.execute('model', 'ir.ui.icon', 'list_icons',
                 rpc.CONTEXT)
         except TrytonServerError:
             icons = []
-        for icon_id, icon_name in icons:
-            if refresh and icon_name in cls._icons:
-                continue
-            cls._tryton_icons.append((icon_id, icon_name))
-            cls._name2id[icon_name] = icon_id
+        cls._name2id = name2id = OrderedDict((n, i) for i, n in icons)
+        if not refresh:
+            cls._icons.clear()
+        return name2id
 
     @classmethod
-    def register_icon(cls, iconname):
-        # iconname might be '' when page do not define icon
-        if (not iconname
-                or iconname in cls._icons
-                or iconname in cls._local_icons):
-            return
-        if iconname not in cls._name2id:
-            cls.load_icons(refresh=True)
-        try:
-            icon_ref = (cls._name2id[iconname], iconname)
-        except KeyError:
-            logger.error(f"Unknown icon {iconname}")
-            cls._icons[iconname] = None
-            return
-        idx = cls._tryton_icons.index(icon_ref)
-        to_load = slice(max(0, idx - cls.batchnum // 2),
+    def _get_icon(cls, iconname):
+        data = cls._icons.get(iconname)
+        if data is not None:
+            return data
+        path = cls._local_icons.get(iconname)
+        if path is not None:
+            with open(path, 'rb') as fp:
+                return fp.read()
+
+        name2id = cls._name2id
+        if iconname not in name2id:
+            name2id = cls.load_icons(refresh=True)
+            if iconname not in name2id:
+                logger.error(f"Unknown icon {iconname}")
+                cls._icons[iconname] = None
+                return
+        names = [n for n in name2id if n not in cls._icons or n == iconname]
+        idx = names.index(iconname)
+        to_load = slice(
+            max(0, idx - cls.batchnum // 2),
             idx + cls.batchnum // 2)
-        ids = [e[0] for e in cls._tryton_icons[to_load]]
+        ids = [name2id[n] for n in names[to_load]]
         try:
             icons = rpc.execute('model', 'ir.ui.icon', 'read', ids,
                 ['name', 'icon'], rpc.CONTEXT)
         except TrytonServerError:
             icons = []
+        data = None
         for icon in icons:
             name = icon['name']
-            data = icon['icon'].encode('utf-8')
-            cls._icons[name] = data
-            cls._tryton_icons.remove((icon['id'], icon['name']))
-            del cls._name2id[icon['name']]
+            icondata = icon['icon'].encode('utf-8')
+            cls._icons[name] = icondata
+            if name == iconname:
+                data = icondata
+        return data
 
     @classmethod
     def get_pixbuf(cls, iconname, size=16, color=None, badge=None):
         if not iconname:
             return
         colors = CONFIG['icon.colors'].split(',')
-        cls.register_icon(iconname)
         if iconname not in cls._pixbufs[(size, badge)]:
-            data = None
-            if iconname in cls._icons:
-                data = cls._icons[iconname]
-            elif iconname in cls._local_icons:
-                path = cls._local_icons[iconname]
-                with open(path, 'rb') as fp:
-                    data = fp.read()
+            data = cls._get_icon(iconname)
             if not data:
-                logger.error("Unknown icon %s" % iconname)
                 return
             if not color:
                 color = colors[0]
@@ -199,16 +198,40 @@ class IconFactory:
         return urllib.parse.urlunsplit(parts)
 
     @classmethod
-    @lru_cache(maxsize=CONFIG['image.cache_size'])
-    def get_pixbuf_url(cls, url, size=16, size_param=None):
+    def _get_pixbuf_url(cls, url, size=16):
         if not url:
             return
-        url = cls._convert_url(url, size, size_param=size_param)
+        pixbuf = None
+        logger.info(f'GET {url}')
         try:
             with urllib.request.urlopen(url) as response:
-                return data2pixbuf(response.read(), size, size)
+                pixbuf = data2pixbuf(response.read(), size, size)
         except urllib.error.URLError:
             logger.info("Can not fetch %s", url, exc_info=True)
+        cls._url_pixbufs[url] = pixbuf
+        return pixbuf
+
+    @classmethod
+    def get_pixbuf_url(cls, url, size=16, size_param=None, callback=None):
+        if not url:
+            return
+
+        url = cls._convert_url(url, size, size_param=size_param)
+        pixbuf = cls._url_pixbufs.get(url)
+        if pixbuf is not None:
+            return pixbuf
+
+        if callback:
+            def fetch(url, size):
+                pixbuf = cls._get_pixbuf_url(url, size)
+                GLib.idle_add(lambda: callback(pixbuf))
+            cls._executor.submit(fetch, url, size)
+            if size not in cls._empty_pixbufs:
+                cls._empty_pixbufs[size] = _data2pixbuf(
+                    cls._empty_gif, size, size)
+            return cls._empty_pixbufs[size]
+        else:
+            return cls._get_pixbuf_url(url, size, size_param)
 
 
 IconFactory.load_local_icons()
@@ -806,7 +829,7 @@ class ConcurrencyDialog(UniqueDialog):
         dialog = Gtk.MessageDialog(
             transient_for=parent, modal=True, destroy_with_parent=True,
             message_type=Gtk.MessageType.QUESTION,
-            buttons=Gtk.ButtonsType.NONE, text=_('Concurrency Exception'))
+            buttons=Gtk.ButtonsType.NONE, text=_("Concurrency Warning"))
         dialog.format_secondary_text(
             _('This record has been modified while you were editing it.'))
         cancel_button = dialog.add_button(
@@ -851,7 +874,7 @@ class ErrorDialog(UniqueDialog):
         dialog = Gtk.MessageDialog(
             transient_for=parent, modal=True, destroy_with_parent=True,
             message_type=Gtk.MessageType.ERROR, buttons=Gtk.ButtonsType.NONE)
-        dialog.set_default_size(600, 400)
+        dialog.set_default_size(600, 200)
         dialog.set_position(Gtk.WindowPosition.CENTER)
 
         dialog.add_button(set_underline(_("Close")), Gtk.ResponseType.CANCEL)
@@ -866,6 +889,7 @@ class ErrorDialog(UniqueDialog):
         scrolledwindow.set_policy(
             Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
         scrolledwindow.set_shadow_type(Gtk.ShadowType.NONE)
+        scrolledwindow.set_min_content_height(300)
 
         viewport = Gtk.Viewport()
         viewport.set_shadow_type(Gtk.ShadowType.NONE)
@@ -877,8 +901,12 @@ class ErrorDialog(UniqueDialog):
 
         viewport.add(textview)
         scrolledwindow.add(viewport)
+        expander = Gtk.Expander()
+        expander.set_label(_("Details"))
+        expander.add(scrolledwindow)
+        expander.set_resize_toplevel(True)
         dialog.vbox.pack_start(
-            scrolledwindow, expand=True, fill=True, padding=0)
+            expander, expand=False, fill=True, padding=0)
 
         button_roundup = Gtk.LinkButton.new_with_label(
             CONFIG['bug.url'], _("Report Bug"))
@@ -980,10 +1008,13 @@ def process_exception(exception, *args, **kwargs):
             name, msg, description = exception.args
             res = userwarning(description, msg)
             if res in ('always', 'ok'):
-                RPCExecute(
-                    'model', 'res.user.warning', 'skip',
-                    name, (res == 'always'),
-                    process_exception=False)
+                try:
+                    RPCExecute(
+                        'model', 'res.user.warning', 'skip',
+                        name, (res == 'always'),
+                        process_exception=False)
+                except RPCException:
+                    pass
                 return rpc_execute(*args)
         elif exception.faultCode == 'UserError':
             msg, description, domain = exception.args
@@ -1021,12 +1052,11 @@ def process_exception(exception, *args, **kwargs):
                     PLOCK.release()
                 if args:
                     return rpc_execute(*args)
-        elif exception.faultCode == str(int(HTTPStatus.TOO_MANY_REQUESTS)):
+        elif exception.faultCode in map(str, HTTPStatus):
+            err_msg = '[%s] %s' % (exception.faultCode, exception.faultString)
             message(
-                _('Too many requests. Try again later.'),
+                _('Error: "%s". Try again later.') % err_msg,
                 msg_type=Gtk.MessageType.ERROR)
-        elif exception.faultCode == str(int(HTTPStatus.NOT_FOUND)):
-            message(_("Not found."), msg_type=Gtk.MessageType.ERROR)
         else:
             error(exception, exception.faultString)
     else:
@@ -1111,7 +1141,7 @@ class Login(object):
                 if exception.faultCode != 'LoginException':
                     raise
                 name, msg, type = exception.args
-                value = getattr(self, 'get_%s' % type)(msg)
+                value = getattr(self, 'get_%s' % type)(msg, name)
                 if value is None:
                     raise TrytonError('QueryCanceled')
                 parameters[name] = value
@@ -1120,12 +1150,35 @@ class Login(object):
                 return
 
     @classmethod
-    def get_char(cls, message):
+    def get_char(cls, message, name):
         return ask(message)
 
     @classmethod
-    def get_password(cls, message):
-        return ask(message, visibility=False)
+    def get_password(cls, message_, name):
+        class AskPasswordDialog(AskDialog):
+            def build_dialog(self, *args, **kwargs):
+                tooltips = Tooltips()
+                dialog = super().build_dialog(*args, **kwargs)
+                box = dialog.get_message_area()
+                button = Gtk.Button.new_with_label(
+                    _("Reset forgotten password"))
+                button.set_alignment(0, 0.5)
+                button.set_relief(Gtk.ReliefStyle.NONE)
+                tooltips.set_tip(
+                    button, _("Send you an email to reset your password."))
+                button.connect('clicked', self.reset_password)
+                box.pack_start(button, False, False, 0)
+                return dialog
+
+            def reset_password(self, button):
+                rpc.reset_password()
+                message(
+                    _("A request to reset your password has been sent.\n"
+                        "Please check your mailbox."))
+                self.entry.grab_focus()
+        if name == 'password':
+            ask = AskPasswordDialog()
+        return ask(message_, visibility=False)
 
 
 class Logout:
@@ -1261,9 +1314,7 @@ class RPCProgress(object):
 
         def return_():
             if self.exception:
-                if not isinstance(self.exception, RPCException):
-                    raise RPCException(self.exception)
-                raise self.exception
+                raise RPCException(self.exception)
             else:
                 return self.res
 
@@ -1284,10 +1335,15 @@ def RPCExecute(*args, **kwargs):
 
 
 def RPCContextReload(callback=None):
+    def clean(context):
+        return {
+            k: v for k, v in context.items()
+            if k != 'locale' and not k.endswith('.rec_name')}
+
     def update(context):
         rpc.context_reset()
         try:
-            rpc.CONTEXT.update(context())
+            rpc.CONTEXT.update(clean(context()))
         except RPCException:
             pass
         if callback:
@@ -1297,7 +1353,7 @@ def RPCContextReload(callback=None):
         callback=update if callback else None)
     if not callback:
         rpc.context_reset()
-        rpc.CONTEXT.update(context)
+        rpc.CONTEXT.update(clean(context))
 
 
 class Tooltips(object):

tryton/common/completion.py

@@ -5,7 +5,7 @@ import logging
 
 from gi.repository import GLib, Gtk
 
-from tryton.common import RPCExecute
+from tryton.common import RPCException, RPCExecute
 from tryton.config import CONFIG
 from tryton.exceptions import TrytonError, TrytonServerError
 
@@ -72,7 +72,7 @@ def update_completion(entry, record, field, model, domain=None):
                 'model', model, 'autocomplete', search_text, domain,
                 CONFIG['client.limit'], order, context=context,
                 process_exception=False, callback=callback)
-        except Exception:
+        except RPCException:
             logger.warning(
                 "Unable to search for completion of %s", model,
                 exc_info=True)

tryton/common/domain_inversion.py

@@ -433,8 +433,7 @@ def unique_value(domain, single_value=True):
                         and operator == 'in' and len(value) == 1))
                 and (not count
                     or (count == 1 and model and name.endswith('.id')))):
-            if operator == 'in' and single_value:
-                value = value[0]
+            value = value if operator == '=' and single_value else value[0]
             if model and name.endswith('.id'):
                 model = model[0]
                 value = [model, value]

tryton/common/domain_parser.py

@@ -128,12 +128,10 @@ def unescape(value, escape='\\'):
     return value.replace(escape + '%', '%').replace(escape + '_', '_')
 
 
-def quote(value, empty=False):
+def quote(value):
     "Quote string if needed"
     if not isinstance(value, str):
         return value
-    if empty and value == '':
-        return '""'
     if '\\' in value:
         value = value.replace('\\', '\\\\')
     if '"' in value:
@@ -309,7 +307,7 @@ def convert_value(field, value, context=None):
     return converts.get(field['type'], lambda: value)()
 
 
-def format_value(field, value, target=None, context=None, _quote_empty=False):
+def format_value(field, value, target=None, context=None):
     "Format value for field"
     if context is None:
         context = {}
@@ -412,11 +410,9 @@ def format_value(field, value, target=None, context=None, _quote_empty=False):
         'many2one': format_many2one,
         }
     if isinstance(value, (list, tuple)):
-        return ';'.join(
-            format_value(field, x, context=context, _quote_empty=True)
-            for x in value)
+        return ';'.join(format_value(field, x, context=context) for x in value)
     return quote(converts.get(field['type'],
-            lambda: value if value is not None else '')(), empty=_quote_empty)
+            lambda: value if value is not None else '')())
 
 
 def complete_value(field, value):
@@ -651,16 +647,10 @@ class DomainParser(object):
                 operator = operator.rstrip(def_operator
                     ).replace('not', '!').strip()
             if operator.endswith('in'):
-                if isinstance(value, (list, tuple)) and len(value) == 1:
-                    if operator == 'not in':
-                        operator = '!='
-                    else:
-                        operator = '='
+                if operator == 'not in':
+                    operator = '!'
                 else:
-                    if operator == 'not in':
-                        operator = '!'
-                    else:
-                        operator = ''
+                    operator = ''
             formatted_value = format_value(field, value, target, self.context)
             if (operator in OPERATORS
                     and field['type'] in ('char', 'text', 'selection')

tryton/common/selection.py

@@ -30,10 +30,13 @@ class SelectionMixin(object):
                 and key not in self._values2selection):
             try:
                 if self.attrs.get('selection_change_with'):
-                    selection = RPCExecute('model', self.model_name, selection,
-                        value)
+                    selection = RPCExecute(
+                        'model', self.model_name, selection, value,
+                        process_exception=False)
                 else:
-                    selection = RPCExecute('model', self.model_name, selection)
+                    selection = RPCExecute(
+                        'model', self.model_name, selection,
+                        process_exception=False)
             except RPCException:
                 selection = []
             self._values2selection[key] = selection

tryton/common/tempfile.py

@@ -0,0 +1,34 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+import atexit
+import os
+import shutil
+import tempfile
+
+_files, _directories = [], []
+
+
+def mkstemp(*args, **kwargs):
+    fileno, fname = tempfile.mkstemp(*args, **kwargs)
+    _files.append(fname)
+    return fileno, fname
+
+
+def mkdtemp(*args, **kwargs):
+    dname = tempfile.mkdtemp(*args, **kwargs)
+    _directories.append(dname)
+    return dname
+
+
+@atexit.register
+def clean():
+    for fname in _files:
+        try:
+            os.remove(fname)
+        except FileNotFoundError:
+            pass
+    _files.clear()
+
+    for dname in _directories:
+        shutil.rmtree(dname, ignore_errors=True)
+    _directories.clear()

tryton/config.py

@@ -8,7 +8,7 @@ import optparse
 import os
 import shutil
 import sys
-import tempfile
+from tempfile import NamedTemporaryFile
 
 from gi.repository import GdkPixbuf
 
@@ -81,6 +81,7 @@ class ConfigManager(object):
             'login.db': demo_database,
             'login.expanded': False,
             'client.title': 'Tryton',
+            'rpc.cache_size': 1024,
             'client.modepda': False,
             'client.toolbar': 'default',
             'client.save_tree_width': True,
@@ -185,7 +186,7 @@ class ConfigManager(object):
             parser.read([self.rcfile])
         except configparser.Error:
             config_dir = os.path.dirname(self.rcfile)
-            with tempfile.NamedTemporaryFile(
+            with NamedTemporaryFile(
                     delete=False, prefix='tryton_', suffix='.conf',
                     dir=config_dir) as temp_file:
                 temp_name = temp_file.name

tryton/data/locale/bg/LC_MESSAGES/tryton.po

@@ -30,6 +30,10 @@ msgstr "укажете адреса на сървъра"
 msgid "disable thread usage"
 msgstr ""
 
+#, python-format
+msgid "Invalid response id (%s) expected %s"
+msgstr ""
+
 #, python-format
 msgid "Unable to set locale %s"
 msgstr "Не може да зададе локални настройки %s"
@@ -135,15 +139,27 @@ msgstr ""
 msgid "Could not get a session."
 msgstr "Не може да се свърже със сървъра!"
 
-msgid "Too many requests. Try again later."
+#, python-format
+msgid "Error \"%s\". Try again later."
 msgstr ""
 
-msgid "Not found."
+msgid "Too many requests. Try again later."
 msgstr ""
 
 msgid "Not Found."
 msgstr ""
 
+msgid "Reset forgotten password"
+msgstr ""
+
+msgid "Send you an email to reset your password."
+msgstr ""
+
+msgid ""
+"A request to reset your password has been sent.\n"
+"Please check your mailbox."
+msgstr ""
+
 #, fuzzy
 msgid "..."
 msgstr "..."
@@ -1157,7 +1173,16 @@ msgstr "Размера на изображението е много голям!
 msgid "Copy"
 msgstr ""
 
-msgid "Paste"
+msgid "Copy Row"
+msgstr ""
+
+msgid "Copy Rows"
+msgstr ""
+
+msgid "Copy Column"
+msgstr ""
+
+msgid "Paste Rows"
 msgstr ""
 
 msgid ".."