lino 25.1.6__py3-none-any.whl → 25.2.0__py3-none-any.whl

lino/management/commands/demotest.py

@@ -101,7 +101,8 @@ class TestCase(DemoTestCase):
         # every new failure will now blacklist it again, the
         # max_failed_auth_per_ip no longer counts.
 
-        time.sleep(1.5)
+        # time.sleep(1.5)
+        time.sleep(5)
         self.assertEqual(login("bad"), "Failed to sign in as robin.")
         self.assertEqual(rec.login_failures, 5)
         self.assertEqual(

lino/mixins/__init__.py

@@ -70,7 +70,7 @@ class Phonable(model.Model):
 
 class Modified(model.Model):
     """
-    Adds a a timestamp field which holds the last modification time of
+    Adds a a timestamp field that holds the last modification time of
     every individual database object.
 
     .. attribute:: modified

lino/modlib/checkdata/choicelists.py

@@ -34,8 +34,9 @@ class Checker(dd.Choice):
     self = None
     model = None
     help_text = None
+    no_auto = False  # SupplierChecker.activate() sets no_auto to True
 
-    def __init__(self):
+    def __init__(self, **kwargs):
         # value = self.__module__ + '.' + self.__class__.__name__
         value = self.__module__.split(".")[-2] + "." + self.__class__.__name__
         # if isinstance(self.model, six.string_types):
@@ -46,13 +47,13 @@ class Checker(dd.Choice):
             text = value
         else:
             text = self.verbose_name
-        super().__init__(value, text, None)
+        super().__init__(value, text, None, **kwargs)
 
     @classmethod
-    def activate(cls):
+    def activate(cls, **kwargs):
         if cls.self is not None:
             raise Exception("Duplicate call to {0}.activate()".format(cls))
-        cls.self = cls()
+        cls.self = cls(**kwargs)
         Checkers.add_item_instance(cls.self)
 
     @classmethod

lino/modlib/checkdata/models.py

@@ -250,18 +250,19 @@ def get_checkers_for(model):
     return get_checkable_models()[model]
 
 
-def check_instance(obj):
-    """
-    Run all checkers on the given instance.  Return list of problem messages.
-    """
+def check_instance(obj, **kwargs):
     for chk in get_checkers_for(obj.__class__):
-        for prb in chk.check_instance(obj):
-            yield prb
+        for fixable, msg in chk.check_instance(obj, **kwargs):
+            if fixable:
+                msg = f"(\u2605) {msg}"
+            print(msg)
 
 
-def get_checkable_models(*args):
+def get_checkable_models(*args, only_auto=False):
     checkable_models = OrderedDict()
     for chk in Checkers.get_list_items():
+        if only_auto and chk.no_auto:
+            continue
         if len(args):
             skip = True
             for arg in args:
@@ -280,7 +281,7 @@ def check_data(ar, args=[], fix=True, prune=False):
     # verbosity 0=minimal output, 1=normal output, 2=verbose output, 3=very verbose output
     Message = rt.models.checkdata.Message
     # raise Exception("20231230")
-    mc = get_checkable_models(*args)
+    mc = get_checkable_models(*args, only_auto=True)
     if len(mc) == 0 and len(args) > 0:
         raise Exception("No checker matches {0}".format(args))
     if prune:

lino/modlib/help/models.py

@@ -16,6 +16,11 @@ class OpenHelpWindow(dd.Action):
     action_name = "open_help"
     # icon_name = 'help'
     default_format = "ajax"
+
+    # add spaces because React enlarges button_text when len() is 1 and for "?"
+    # this doesn't look nice. But adding spaces breaks a series of doctests, so
+    # I undid that change:
+    # button_text = " ? "
     button_text = "?"
     select_rows = False
     help_text = _("Open Help Window")

lino/modlib/jinja/__init__.py

@@ -39,10 +39,6 @@ class Plugin(ad.Plugin):
 
         self.renderer = JinjaRenderer(self)
 
-        # internal backwards compat:
-        # kernel.site.jinja_env = self.renderer.jinja_env
-        # TODO: remove above lines and convert old code
-
     def list_templates(self, ext, *groups):
         """Return a list of possible choices for a field that contains a
         template name.

lino/modlib/memo/__init__.py

@@ -59,7 +59,7 @@ class Plugin(ad.Plugin):
     """
 
     short_preview_length = 300
-    short_preview_image_height = "8em"
+    # short_preview_image_height = "8em"
 
     def get_requirements(self, site):
         if self.use_markup:

lino/modlib/periods/mixins.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2008-2024 Rumma & Ko Ltd
+# Copyright 2008-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 import datetime
@@ -12,30 +12,6 @@ from lino.mixins import Referrable
 from lino.utils import ONE_DAY
 
 from lino.modlib.office.roles import OfficeStaff
-from lino.modlib.system.choicelists import DurationUnits
-
-
-def get_range_for_date(date):
-    """
-    Return the default start and end date of the period to create for the given
-    date.
-    """
-    pt = dd.plugins.periods.period_type
-    month = date.month
-    year = date.year
-    month -= dd.plugins.periods.start_month
-    if month < 0:
-        month += 12
-        year -= 1
-    period = int(month / pt.duration)
-    month = dd.plugins.periods.start_month + period * pt.duration
-    if month > 12:
-        month -= 12
-        year += 1
-    sd = datetime.date(year, month, 1)
-    # ed = sd.replace(month=sd.month + pt.duration + 1, 1) - ONE_DAY
-    ed = DurationUnits.months.add_duration(sd, pt.duration) - ONE_DAY
-    return (sd, ed)
 
 
 class PeriodRange(dd.Model):

lino/modlib/periods/models.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2008-2024 Rumma & Ko Ltd
+# Copyright 2008-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 import datetime
@@ -11,9 +11,8 @@ from lino import mixins
 from lino.utils import ONE_DAY
 from lino.mixins.periods import DateRange
 from lino.mixins import Referrable
-
+from lino.modlib.system.choicelists import DurationUnits
 from lino.modlib.office.roles import OfficeStaff
-from .mixins import get_range_for_date
 from .choicelists import PeriodTypes, PeriodStates
 
 NEXT_YEAR_SEP = "/"
@@ -59,15 +58,26 @@ class StoredYear(DateRange, Referrable):
         return str(year) + NEXT_YEAR_SEP + str(year+1)[-2:]
 
     @classmethod
-    def get_or_create_from_date(cls, date):
+    def get_range_for_date(cls, date):
+        month = date.month
+        year = date.year
+        month -= dd.plugins.periods.start_month - 1
+        if month < 1:
+            year -= 1
+        sd = datetime.date(year, dd.plugins.periods.start_month, 1)
+        ed = sd.replace(year=year+1) - ONE_DAY
+        return (sd, ed)
+
+    @classmethod
+    def get_or_create_from_date(cls, date, save=True):
         ref = cls.get_ref_for_date(date)
         obj = cls.get_by_ref(ref, None)
         if obj is None:
-            sd = datetime.date(date.year, dd.plugins.periods.start_month, 1)
-            ed = sd.replace(year=date.year+1) - ONE_DAY
+            sd, ed = cls.get_range_for_date(date)
             obj = cls(ref=ref, start_date=sd, end_date=ed)
-            obj.full_clean()
-            obj.save()
+            if save:
+                obj.full_clean()
+                obj.save()
         return obj
 
     def __str__(self):
@@ -157,12 +167,35 @@ class StoredPeriod(DateRange, Referrable):
         # period = (month_offset % (periods_per_year-1)) + 1
         return pt.ref_template.format(**locals())
 
+    @classmethod
+    def get_range_for_date(cls, date):
+        """
+        Return the default start and end date of the period to create for the given
+        date.
+        """
+        pt = dd.plugins.periods.period_type
+        month = date.month
+        year = date.year
+        month -= dd.plugins.periods.start_month
+        if month < 1:
+            month += 12
+            year -= 1
+        period = int(month / pt.duration)
+        month = dd.plugins.periods.start_month + period * pt.duration
+        if month > 12:
+            month -= 12
+            year += 1
+        sd = datetime.date(year, month, 1)
+        # ed = sd.replace(month=sd.month + pt.duration + 1, 1) - ONE_DAY
+        ed = DurationUnits.months.add_duration(sd, pt.duration) - ONE_DAY
+        return (sd, ed)
+
     @classmethod
     def get_or_create_from_date(cls, date):  # get_default_for_date until 20241020
         ref = date2ref(date)
         obj = cls.get_by_ref(ref, None)
         if obj is None:
-            sd, ed = get_range_for_date(date)
+            sd, ed = cls.get_range_for_date(date)
             obj = cls(ref=ref, start_date=sd, end_date=ed)
             obj.full_clean()
             obj.save()

lino/modlib/system/choicelists.py

@@ -17,7 +17,7 @@ from lino.core.roles import login_required, Explorer
 from lino.core.fields import virtualfield
 from lino.utils.dates import DateRangeValue
 from lino.utils.format_date import day_and_month, fds
-from lino.utils.html import mark_safe, format_html
+from lino.utils.html import mark_safe, format_html, escape
 
 
 class YesNo(ChoiceList):
@@ -236,21 +236,22 @@ class DisplayColors(ChoiceList):
     item_class = DisplayColor
     required_roles = login_required(Explorer)
     column_names = "value name text font_color"
+    preferred_width = 10
 
     @virtualfield(models.CharField(_("Font color")))
     def font_color(cls, choice, ar):
         return choice.font_color
 
-    # TODO: The combobox used to select a color should include a sample of each
-    # color. The following should theoretically do it, but the <span> tag gets
-    # escaped somewhere even though it is marked as safe.
-    # @classmethod
-    # def display_text(cls, bc):
-    #     sample = f"""<span style="background-color:{bc.name};color:{bc.font_color}">(sample)</span>"""
-    #     sample = mark_safe(sample)
-    #     txt = format_html("{} {}", bc.text, sample)
-    #     # raise Exception(f"20250118 {txt.__class__}")
-    #     return txt
+    @classmethod
+    def display_text(cls, bc):
+        # text = escape(bc.text)
+        # txt = f"""<span style="background-color:{bc.name};color:{bc.font_color}">{text}</span>"""
+        # txt = mark_safe(txt)
+        sample = f"""<span style="padding:3pt;background-color:{bc.name};color:{bc.font_color}">(sample)</span>"""
+        sample = mark_safe(sample)
+        txt = format_html("{} {}", bc.text, sample)
+        # raise Exception(f"20250118 {txt.__class__}")
+        return txt
 
 add = DisplayColors.add_item
 # cssColors = 'White Silver Gray Black Red Maroon Yellow Olive Lime Green Aqua Teal Blue Navy Fuchsia Purple'

lino/utils/config.py

@@ -65,6 +65,8 @@ class ConfigDirCache(object):
         config_dirs = []
 
         def add_config_dir(name, mod):
+            if mod.__file__ is None:
+                raise Exception(f"20250206 Module {mod} has no __file__!")
             pth = join(dirname(mod.__file__), SUBDIR_NAME)
             if isdir(pth):
                 # logger.info("add_config_dir %s %s", name, pth)

lino/utils/dpy.py

@@ -10,7 +10,8 @@ from lino import logger
 from packaging.version import Version
 
 import os
-import imp
+import importlib.util
+import sys
 from unipath import Path
 # from lino import AFTER17
 
@@ -33,6 +34,16 @@ from lino.core.utils import obj2str, full_model_name
 SUFFIX = ".py"
 
 
+# Importing a source file directly from path
+# https://docs.python.org/3/library/importlib.html#importing-a-source-file-directly
+def import_from_path(module_name, file_path):
+    spec = importlib.util.spec_from_file_location(module_name, file_path)
+    module = importlib.util.module_from_spec(spec)
+    sys.modules[module_name] = module
+    spec.loader.exec_module(module)
+    return module
+
+
 def create_mti_child(parent_model, pk, child_model, **kw):
     """Similar to :func:`lino.utils.mti.insert_child`, but for usage in
     Python dumps (generated by :cmd:`pm dump2py`).
@@ -396,11 +407,12 @@ class DpyDeserializer(LoaderBase):
             fqname = fqname[: -len(SUFFIX)]
             print(fqname)
 
-        desc = (SUFFIX, "r", imp.PY_SOURCE)
+        # desc = (SUFFIX, "r", imp.PY_SOURCE)
         # logger.info("20160817 %s...", options)
         logger.info("Loading data from %s", fp.name)
 
-        module = imp.load_module(fqname, fp, fp.name, desc)
+        module = import_from_path(fqname, fp.name)
+        # module = imp.load_module(fqname, fp, fp.name, desc)
         # module = __import__(filename)
 
         for o in self.deserialize_module(module, **options):