Merge branch 'master' into fix-eventcolumn

Jorenar · web-flow · commit 128994460d14 · 2025-08-29T10:57:38.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
@@ -9,7 +9,7 @@ repos:
       - id: check-added-large-files
       - id: debug-statements
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.17.0
+    rev: v1.17.1
     hooks:
       - id: mypy
         additional_dependencies:
@@ -19,7 +19,7 @@ repos:
           - types-setuptools
           - types-python-dateutil
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.12.5'
+    rev: 'v0.12.10'
     hooks:
       - id: ruff
         args: ["--fix"]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -13,6 +13,7 @@ unreleased
 
 * CHANGE the ``pkg_resources`` library is no longer required.
 * FIX color of eventcolumn when editing events in ikhal
+* FIX the location of caching database to ``$XDG_CACHE_HOME``
 
 0.13.0
 ======
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -1,4 +1,3 @@
-# noqa: E265
 #
 # khal documentation build configuration file, created by
 # sphinx-quickstart on Fri Jul  4 00:00:47 2014.
diff --git a/khal/icalendar.py b/khal/icalendar.py
@@ -469,10 +469,7 @@ def sanitize_rrule(vevent):
 
 def invalid_timezone(prop):
     """check if an icalendar property has a timezone attached we don't understand"""
-    if hasattr(prop.dt, 'tzinfo') and prop.dt.tzinfo is None and 'TZID' in prop.params:
-        return True
-    else:
-        return False
+    return bool(hasattr(prop.dt, 'tzinfo') and prop.dt.tzinfo is None and 'TZID' in prop.params)
 
 
 def _get_all_properties(vevent, prop):
diff --git a/khal/khalendar/backend.py b/khal/khalendar/backend.py
@@ -97,7 +97,7 @@ def at_once(self) -> Iterator['SQLiteDb']:
         self._at_once = True
         try:
             yield self
-        except:  # noqa
+        except:
             raise
         else:
             self.conn.commit()
diff --git a/khal/khalendar/khalendar.py b/khal/khalendar/khalendar.py
@@ -403,7 +403,7 @@ def _update_vevent(self, href: str, calendar: str) -> bool:
             if not isinstance(e, (UpdateFailed, UnsupportedFeatureError, NonUniqueUID)):
                 logger.exception('Unknown exception happened.')
             logger.warning(
-                f'Skipping {calendar}/{href}: {str(e)}\n'
+                f'Skipping {calendar}/{href}: {e!s}\n'
                 'This event will not be available in khal.')
             return False
 
diff --git a/khal/khalendar/vdir.py b/khal/khalendar/vdir.py
@@ -197,7 +197,7 @@ def create(cls, collection_name: PathLike, **kwargs: PathLike) -> dict[str, Path
         if not os.path.exists(pathn):
             os.makedirs(pathn, mode=cls.default_mode)
         elif not os.path.isdir(pathn):
-            raise OSError(f'{repr(pathn)} is not a directory.')
+            raise OSError(f'{pathn!r} is not a directory.')
 
         kwargs['path'] = pathn
         return kwargs
diff --git a/khal/settings/khal.spec b/khal/settings/khal.spec
@@ -77,7 +77,7 @@ type = option('calendar', 'birthdays', 'discover', default='calendar')
 addresses = force_list(default='')
 
 [sqlite]
-# khal stores its internal caching database here, by default this will be in the *$XDG_DATA_HOME/khal/khal.db* (this will most likely be *~/.local/share/khal/khal.db*).
+# khal stores its internal caching database here, by default this will be in the *$XDG_CACHE_HOME/khal/khal.db* (this will most likely be *~/.cache/khal/khal.db*).
 path = expand_db_path(default=None)
 
 # It is mandatory to set (long)date-, time-, and datetimeformat options, all others options in the **[locale]** section are optional and have (sensible) defaults.
diff --git a/khal/settings/settings.py b/khal/settings/settings.py
@@ -129,7 +129,7 @@ def get_config(
                     logger.fatal(
                         'config error:\n'
                         f'in {sectionize(section + [subsection])} {key}: '
-                        f'{str(config_error[key])}'
+                        f'{config_error[key]!s}'
                     )
 
     if abort or not results:
diff --git a/khal/settings/utils.py b/khal/settings/utils.py
@@ -113,9 +113,9 @@ def expand_path(path: str) -> str:
 
 
 def expand_db_path(path: str) -> str:
-    """expands `~` as well as variable names, defaults to $XDG_DATA_HOME"""
+    """expands `~` as well as variable names, defaults to $XDG_CACHE_HOME"""
     if path is None:
-        path = join(xdg.BaseDirectory.xdg_data_home, 'khal', 'khal.db')
+        path = join(xdg.BaseDirectory.xdg_cache_home, 'khal', 'khal.db')
     return expanduser(expandvars(path))
 
 
diff --git a/khal/ui/calendarwidget.py b/khal/ui/calendarwidget.py
@@ -110,10 +110,7 @@ def reset_styles(self, focus: bool=False) -> None:
 
     @property
     def marked(self) -> bool:
-        if 'mark' in [self.halves[0].attr_map[None], self.halves[1].attr_map[None]]:
-            return True
-        else:
-            return False
+        return 'mark' in [self.halves[0].attr_map[None], self.halves[1].attr_map[None]]
 
     @classmethod
     def selectable(cls) -> bool:
diff --git a/khal/utils.py b/khal/utils.py
@@ -151,10 +151,7 @@ def to_naive_utc(dtime: dt.datetime) -> dt.datetime:
 
 def is_aware(dtime: dt.datetime) -> bool:
     """test if a datetime instance is timezone aware"""
-    if dtime.tzinfo is not None and dtime.tzinfo.utcoffset(dtime) is not None:
-        return True
-    else:
-        return False
+    return bool(dtime.tzinfo is not None and dtime.tzinfo.utcoffset(dtime) is not None)
 
 
 def relative_timedelta_str(day: dt.date) -> str:
diff --git a/tests/cli_test.py b/tests/cli_test.py
@@ -17,11 +17,13 @@
 
 class CustomCliRunner(CliRunner):
     def __init__(self, config_file, db=None, calendars=None,
-                 xdg_data_home=None, xdg_config_home=None, tmpdir=None, **kwargs) -> None:
+                 xdg_data_home=None, xdg_config_home=None,
+                 xdg_cache_home=None, tmpdir=None, **kwargs) -> None:
         self.config_file = config_file
         self.db = db
         self.calendars = calendars
         self.xdg_data_home = xdg_data_home
+        self.xdg_cache_home = xdg_cache_home
         self.xdg_config_home = xdg_config_home
         self.tmpdir = tmpdir
 
@@ -40,12 +42,14 @@ def runner(tmpdir, monkeypatch):
     calendar3 = tmpdir.mkdir('calendar3')
 
     xdg_data_home = tmpdir.join('vdirs')
+    xdg_cache_home = tmpdir.join('.cache')
     xdg_config_home = tmpdir.join('.config')
     config_file = xdg_config_home.join('khal').join('config')
 
     # TODO create a vdir config on disk and let vdirsyncer actually read it
     monkeypatch.setattr('vdirsyncer.cli.config.load_config', lambda: Config())
     monkeypatch.setattr('xdg.BaseDirectory.xdg_data_home', str(xdg_data_home))
+    monkeypatch.setattr('xdg.BaseDirectory.xdg_cache_home', str(xdg_cache_home))
     monkeypatch.setattr('xdg.BaseDirectory.xdg_config_home', str(xdg_config_home))
     monkeypatch.setattr('xdg.BaseDirectory.xdg_config_dirs', [str(xdg_config_home)])
 
@@ -65,7 +69,7 @@ def inner(print_new=False, default_calendar=True, days=2, **kwargs):
         runner = CustomCliRunner(
             config_file=config_file, db=db, calendars={"one": calendar},
             xdg_data_home=xdg_data_home, xdg_config_home=xdg_config_home,
-            tmpdir=tmpdir,
+            xdg_cache_home=xdg_cache_home, tmpdir=tmpdir,
         )
         return runner
     return inner
@@ -797,15 +801,15 @@ def test_configure_command_create_vdir(runner):
         main_khal, ['configure'],
         input=choices(),
     )
-    assert f'Successfully wrote configuration to {str(runner.config_file)}' in result.output
+    assert f'Successfully wrote configuration to {runner.config_file!s}' in result.output
     assert result.exit_code == 0
     with open(str(runner.config_file)) as f:
         actual_config = ''.join(f.readlines())
 
     assert actual_config == f'''[calendars]
 
 [[private]]
-path = {str(runner.xdg_data_home)}/khal/calendars/private
+path = {runner.xdg_data_home!s}/khal/calendars/private
 type = calendar
 
 [locale]
@@ -826,7 +830,7 @@ def test_configure_command_create_vdir(runner):
         main_khal, ['configure'],
         input=choices(),
     )
-    assert f'Successfully wrote configuration to {str(runner.config_file)}' in result.output
+    assert f'Successfully wrote configuration to {runner.config_file!s}' in result.output
     assert result.exit_code == 0
     with open(str(runner.config_file)) as f:
         actual_config = ''.join(f.readlines())
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -48,7 +48,7 @@ def coll_vdirs(tmpdir) -> CollVdirType:
     for name in example_cals:
         path = str(tmpdir) + '/' + name
         os.makedirs(path, mode=0o770)
-        readonly = True if name == 'a_calendar' else False
+        readonly = name == 'a_calendar'
         calendars[name] = CalendarConfiguration(
             name=name,
             path=path,
@@ -70,7 +70,7 @@ def coll_vdirs_birthday(tmpdir):
     for name in example_cals:
         path = str(tmpdir) + '/' + name
         os.makedirs(path, mode=0o770)
-        readonly = True if name == 'a_calendar' else False
+        readonly = name == 'a_calendar'
         calendars[name] = {'name': name, 'path': path, 'color': 'dark blue',
                            'readonly': readonly, 'unicode_symbols': True, 'ctype': 'birthdays',
                            'addresses': 'user@example.com'}
diff --git a/tests/settings_test.py b/tests/settings_test.py
@@ -49,7 +49,7 @@ def test_simple_config(self):
                     'color': None, 'priority': 10, 'type': 'calendar', 'addresses': [''],
                 },
             },
-            'sqlite': {'path': os.path.expanduser('~/.local/share/khal/khal.db')},
+            'sqlite': {'path': os.path.expanduser('~/.cache/khal/khal.db')},
             'locale': LOCALE_BERLIN,
             'default': {
                 'default_calendar': None,
@@ -89,7 +89,7 @@ def test_small(self):
                 'work': {'path': os.path.expanduser('~/.calendars/work/'),
                          'readonly': True, 'color': None, 'priority': 10,
                          'type': 'calendar', 'addresses': ['user@example.com']}},
-            'sqlite': {'path': os.path.expanduser('~/.local/share/khal/khal.db')},
+            'sqlite': {'path': os.path.expanduser('~/.cache/khal/khal.db')},
             'locale': {
                 'local_timezone': get_localzone(),
                 'default_timezone': get_localzone(),

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# noqa: E265`
`2`	`1`	`#`
`3`	`2`	`# khal documentation build configuration file, created by`
`4`	`3`	`# sphinx-quickstart on Fri Jul 4 00:00:47 2014.`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ def get_config(`
`129`	`129`	`logger.fatal(`
`130`	`130`	`'config error:\n'`
`131`	`131`	`f'in {sectionize(section + [subsection])} {key}: '`
`132`		`- f'{str(config_error[key])}'`
	`132`	`+ f'{config_error[key]!s}'`
`133`	`133`	`)`
`134`	`134`
`135`	`135`	`if abort or not results:`