type updates from upstream

my/activitywatch/active_window.py

@@ -16,7 +16,8 @@
 from functools import partial
 from itertools import chain
 
-from my.core import get_files, Stats, Paths, dataclass, make_logger, make_config
+from dataclasses import dataclass
+from my.core import get_files, Stats, Paths, make_logger, make_config
 from my.utils.input_source import InputSource
 
 from more_itertools import unique_everseen

my/apple/privacy_export.py

@@ -7,7 +7,8 @@
 
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import apple as user_config  # type: ignore[attr-defined]
-from my.core import PathIsh, dataclass
+from dataclasses import dataclass
+from my.core import PathIsh
 
 
 @dataclass
@@ -29,7 +30,7 @@ class config(user_config.privacy_export):
 Element = Union[_Element, None]
 
 from my.core import Stats, Res, make_logger
-from my.core.common import mcachew
+from my.core.cachew import mcachew
 
 
 logger = make_logger(__name__)

my/bash.py

@@ -33,8 +33,9 @@
 
 from more_itertools import unique_everseen
 
-from my.core import get_files, Stats, make_logger, Paths, dataclass
-from my.core.common import mcachew
+from dataclasses import dataclass
+from my.core import get_files, Stats, make_logger, Paths
+from my.core.cachew import mcachew
 from my.utils.time import parse_datetime_sec
 from my.utils.input_source import InputSource
 

my/blizzard/gdpr.py

@@ -5,8 +5,9 @@
 
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import blizzard as user_config  # type: ignore[attr-defined]
-from my.core import PathIsh, dataclass, make_logger
-from my.core.common import mcachew
+from dataclasses import dataclass
+from my.core import PathIsh, make_logger
+from my.core.cachew import mcachew
 
 
 @dataclass

my/chess/export.py

@@ -17,8 +17,9 @@
 import chess_export.lichess.model as lmodel
 from more_itertools import unique_everseen
 
-from my.core import get_files, Stats, make_logger, Paths, dataclass
-from my.core.common import mcachew
+from dataclasses import dataclass
+from my.core import get_files, Stats, make_logger, Paths
+from my.core.cachew import mcachew
 from my.utils.input_source import InputSource
 
 

my/discord/data_export.py

@@ -10,10 +10,11 @@
 
 from pathlib import Path
 from typing import List
+from dataclasses import dataclass
 
 from my.config import discord as user_config  # type: ignore[attr-defined]
-from my.core import PathIsh, dataclass, make_config
-from my.core.common import mcachew
+from my.core import PathIsh, make_config
+from my.core.cachew import mcachew
 
 
 @dataclass

my/facebook/gdpr.py

@@ -4,7 +4,8 @@
 
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import facebook as user_config  # type: ignore[attr-defined]
-from my.core import PathIsh, dataclass
+from dataclasses import dataclass
+from my.core import PathIsh
 
 
 @dataclass

my/grouvee/export.py

@@ -14,7 +14,8 @@
 from more_itertools import last
 import grouvee_export.dal as G
 
-from my.core import get_files, Stats, Paths, dataclass
+from dataclasses import dataclass
+from my.core import get_files, Stats, Paths
 
 
 @dataclass

my/ip/discord.py

@@ -4,7 +4,7 @@
 
 
 from my.core import make_logger, Stats
-from my.core.common import mcachew
+from my.core.cachew import mcachew
 from my.core.source import import_source
 
 logger = make_logger(__name__)

my/ip/facebook.py

@@ -5,7 +5,7 @@
 
 from my.core import make_logger, Stats
 from my.core.source import import_source
-from my.core.common import mcachew
+from my.core.cachew import mcachew
 
 
 logger = make_logger(__name__)

my/ipython.py

@@ -22,7 +22,8 @@
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import ipython as user_config  # type: ignore[attr-defined]
 
-from my.core import Paths, dataclass
+from dataclasses import dataclass
+from my.core import Paths
 
 
 @dataclass

my/league/export.py

@@ -7,7 +7,8 @@
 
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import league as user_config  # type: ignore[attr-defined]
-from my.core import Paths, dataclass
+from dataclasses import dataclass
+from my.core import Paths
 
 
 @dataclass

my/linkedin/privacy_export.py

@@ -8,7 +8,8 @@
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import linkedin as user_config  # type: ignore[attr-defined]
 
-from my.core import PathIsh, dataclass
+from dataclasses import dataclass
+from my.core import PathIsh
 
 
 @dataclass

my/listenbrainz/export.py

@@ -16,7 +16,8 @@
 from listenbrainz_export.parse import Listen, iter_listens
 from more_itertools import unique_everseen
 
-from my.core import get_files, Stats, make_logger, Paths, dataclass
+from dataclasses import dataclass
+from my.core import get_files, Stats, make_logger, Paths
 from my.utils.input_source import InputSource
 
 

my/location/apple.py

@@ -1,6 +1,5 @@
 from typing import Iterator
 
-from my.core.common import Stats
 from my.core.source import import_source
 from my.location.common import Location  # type: ignore[import]
 
@@ -19,9 +18,3 @@ def locations() -> Iterator[Location]:
                 elevation=None,
                 datasource="apple",
             )
-
-
-def stats() -> Stats:
-    from my.core import stat
-
-    return {**stat(locations)}

my/mail/imap.py

@@ -18,7 +18,8 @@
 )
 
 
-from my.core import Stats, Paths, dataclass, get_files, make_config
+from dataclasses import dataclass
+from my.core import Stats, Paths, get_files, make_config
 from .common import Email, unique_mail
 
 

my/mail/mbox.py

@@ -11,7 +11,8 @@
 from pathlib import Path
 from typing import List, Iterator, Optional, Sequence, IO, Any
 
-from my.core import Stats, Paths, dataclass, get_files
+from dataclasses import dataclass
+from my.core import Stats, Paths, get_files
 from my.core import make_logger
 
 from .common import Email, unique_mail, try_decode_buf

my/mal/export.py

@@ -13,7 +13,8 @@
 from typing import Iterator, List, Tuple, NamedTuple, Optional
 from functools import lru_cache
 
-from my.core import Stats, make_logger, PathIsh, dataclass, make_config, get_files
+from dataclasses import dataclass
+from my.core import Stats, make_logger, PathIsh, make_config, get_files
 from my.core.structure import match_structure
 
 from malexport.paths import LocalDir

my/minecraft/advancements.py

@@ -8,7 +8,8 @@
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import minecraft as user_config  # type: ignore[attr-defined]
 
-from my.core import Paths, dataclass
+from dataclasses import dataclass
+from my.core import Paths
 
 
 @dataclass

my/mpv/history_daemon.py

@@ -10,7 +10,8 @@
 from my.config import mpv as user_config  # type: ignore[attr-defined]
 
 from typing import Iterator, Sequence, Optional
-from my.core import Paths, dataclass, make_config
+from dataclasses import dataclass
+from my.core import Paths, make_config
 
 
 @dataclass

my/offline/listens.py

@@ -14,7 +14,8 @@
 from offline_listens.listens import Listen
 from offline_listens.parse import iter_dir, parse_file
 
-from my.core import get_files, Stats, Paths, dataclass
+from dataclasses import dataclass
+from my.core import get_files, Stats, Paths
 from my.utils.input_source import InputSource
 
 

my/piazza/scraper.py

@@ -7,7 +7,8 @@
 
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import piazza as user_config  # type: ignore[attr-defined]
-from my.core import Paths, dataclass
+from dataclasses import dataclass
+from my.core import Paths
 
 
 @dataclass

my/project_euler.py

@@ -15,7 +15,8 @@
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import project_euler as user_config  # type: ignore[attr-defined]
 
-from my.core import Paths, dataclass
+from dataclasses import dataclass
+from my.core import Paths
 
 
 @dataclass

my/rss/newsboat/git_history.py

@@ -22,7 +22,8 @@
     Diff,
 )
 
-from my.core import Stats, PathIsh, dataclass
+from dataclasses import dataclass
+from my.core import Stats, PathIsh
 
 
 @dataclass

my/runelite/screenshots.py

@@ -7,7 +7,8 @@
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import runelite as user_config  # type: ignore[attr-defined]
 
-from my.core import Paths, dataclass
+from dataclasses import dataclass
+from my.core import Paths
 
 
 @dataclass

my/scramble/history.py

@@ -7,7 +7,8 @@
 
 from pathlib import Path
 from typing import Optional
-from my.core import dataclass, PathIsh, make_config
+from dataclasses import dataclass
+from my.core import PathIsh, make_config
 
 from my.config import scramble as user_config  # type: ignore[attr-defined]
 

my/skype/gdpr.py

@@ -12,7 +12,8 @@
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import skype as user_config  # type: ignore[attr-defined]
 
-from my.core import Paths, Stats, dataclass
+from dataclasses import dataclass
+from my.core import Paths, Stats
 
 
 @dataclass

my/spotify/gdpr.py

@@ -5,7 +5,8 @@
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import spotify as user_config  # type: ignore[attr-defined]
 
-from my.core import PathIsh, Stats, dataclass
+from dataclasses import dataclass
+from my.core import PathIsh, Stats
 
 
 @dataclass

my/steam/scraper.py

@@ -5,7 +5,8 @@
 
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import steam as user_config  # type: ignore[attr-defined]
-from my.core import Paths, dataclass
+from dataclasses import dataclass
+from my.core import Paths
 
 
 @dataclass

my/todotxt/active.py

@@ -15,7 +15,8 @@
     Iterator,
 )
 
-from my.core import Stats, PathIsh, dataclass
+from dataclasses import dataclass
+from my.core import Stats, PathIsh
 from .common import Todo, TODOTXT_FILES, parse_todotxt_buffer
 
 

my/todotxt/git_history.py

@@ -19,7 +19,8 @@
 
 from git_doc_history import DocHistory, parse_snapshot_diffs, Action
 
-from my.core import Stats, PathIsh, dataclass
+from dataclasses import dataclass
+from my.core import Stats, PathIsh
 from .common import Todo, TODOTXT_FILES, parse_todotxt_buffer
 
 

my/trakt/export.py

@@ -15,8 +15,9 @@
 import traktexport.dal as D
 from traktexport.merge import read_and_merge_exports
 
-from my.core import get_files, Stats, make_logger, Paths, dataclass
-from my.core.common import mcachew
+from dataclasses import dataclass
+from my.core import get_files, Stats, make_logger, Paths
+from my.core.cachew import mcachew
 
 
 @dataclass

my/ttt.py

@@ -13,7 +13,8 @@
 
 from more_itertools import unique_everseen
 
-from my.core import get_files, Stats, Paths, dataclass
+from dataclasses import dataclass
+from my.core import get_files, Stats, Paths
 from my.utils.time import parse_datetime_sec
 from my.utils.input_source import InputSource
 

my/twitch/gdpr.py

@@ -6,7 +6,8 @@
 # see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example
 from my.config import twitch as user_config  # type: ignore[attr-defined]
 
-from my.core import PathIsh, dataclass
+from dataclasses import dataclass
+from my.core import PathIsh
 
 
 @dataclass
@@ -22,7 +23,8 @@ class config(user_config.gdpr):
 from .common import Event, Results
 
 from my.core import make_logger
-from my.core.common import get_files, mcachew, Stats
+from my.core.cachew import mcachew
+from my.core.common import get_files
 from my.utils.input_source import InputSource
 
 logger = make_logger(__name__)
@@ -57,9 +59,3 @@ def _parse_csv_file(p: Path) -> Iterator[Event]:
                 channel=line[5],
                 context=context,
             )
-
-
-def stats() -> Stats:
-    from my.core import stat
-
-    return {**stat(events)}