python-clu 0.10.1__tar.gz → 0.11.2__tar.gz

{python_clu-0.10.1 → python_clu-0.11.2}/.bumpversion.toml

@@ -1,6 +1,6 @@
 
 [tool.bumpversion]
-current_version = "0.10.1"
+current_version = "0.11.2"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{python_clu-0.10.1 → python_clu-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.10.1
+Version: 0.11.2
 Summary: CLU - Common Lightweight Utilities, or Command-Line Utilities (your pick)
 Home-page: https://github.com/fish2000/clu
 Download-URL: https://github.com/fish2000/clu/zipball/master

{python_clu-0.10.1 → python_clu-0.11.2}/clu/__init__.py

@@ -3,7 +3,7 @@
 #    
 #    CLU -- Common Lightweight Utilities
 #    
-#    Copyright © 2012-2025 Alexander Böhn
+#    Copyright © 2012-2035 Alexander Böhn
 #    
 #    Permission is hereby granted, free of charge, to any person obtaining a copy 
 #    of this software and associated documentation files (the "Software"), to deal 
@@ -47,7 +47,7 @@ __title__ = 'clu'
 __author__ = 'Alexander Böhn'
 __maintainer__ = __author__
 __license__ = 'MIT'
-__copyright__ = f'{__title__} © 2012-2025 {__author__}'
+__copyright__ = f'{__title__} © 2012-2035 {__author__}'
 
 # The CLU project version:
 version_info = VersionInfo(__version__)

python_clu-0.11.2/clu/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.11.2'

{python_clu-0.10.1 → python_clu-0.11.2}/clu/abstract.py

@@ -25,10 +25,10 @@ class Slotted(abc.ABCMeta):
         if '__slots__' not in attributes:
             attributes['__slots__'] = tuple()
         
-        return super(Slotted, metacls).__new__(metacls, name, # type: ignore
-                                                        bases,
-                                                        attributes,
-                                                      **kwargs)
+        return super().__new__(metacls, name, # type: ignore
+                                        bases,
+                                        attributes,
+                                      **kwargs)
 
 class SlotMatch(Slotted):
     
@@ -48,10 +48,10 @@ class SlotMatch(Slotted):
             attributes['__match_args__'] = tuple()
         
         # Create the new class via “super(…)” – calling “Slotted.__new__(…)”
-        cls = super(SlotMatch, metacls).__new__(metacls, name, # type: ignore
-                                                         bases,
-                                                         attributes,
-                                                       **kwargs)
+        cls = super().__new__(metacls, name, # type: ignore
+                                       bases,
+                                       attributes,
+                                     **kwargs)
         
         # Set “__match_args__” using “slots_for(…)” and return
         cls.__match_args__ = slots_for(cls)
@@ -70,10 +70,10 @@ class NonSlotted(abc.ABCMeta):
         if '__slots__' in attributes:
             attributes.pop('__slots__')
         
-        return super(NonSlotted, metacls).__new__(metacls, name,
-                                                           bases,
-                                                           attributes,
-                                                         **kwargs)
+        return super().__new__(metacls, name,
+                                        bases,
+                                        attributes,
+                                      **kwargs)
 
 class UnhashableMeta(Slotted):
     
@@ -89,10 +89,10 @@ class UnhashableMeta(Slotted):
             attributes.pop('__hash__')
         attributes['__hash__'] = None
         
-        return super(UnhashableMeta, metacls).__new__(metacls, name,
-                                                               bases,
-                                                               attributes,
-                                                             **kwargs)
+        return super().__new__(metacls, name,
+                                        bases,
+                                        attributes,
+                                      **kwargs)
 
 class Unhashable(abc.ABC, metaclass=UnhashableMeta):
     
@@ -143,6 +143,15 @@ class Sanitizer(Format):
     def render(self, string):
         return self.regex.sub('', string)
 
+class Serializable(abc.ABC):
+    
+    @classmethod
+    def from_dict(cls, instance_dict):
+        ...
+    
+    def to_dict(self):
+        ...
+
 class Cloneable(abc.ABC):
     
     """ An abstract class representing something “clonable.” A cloneable
@@ -335,7 +344,7 @@ class BasePath(Slotted):
     @classmethod
     def __prepare__(metacls, name, bases, basepath="/", **kwargs):
         """ Remove the “basepath” class keyword before calling up """
-        return super(BasePath, metacls).__prepare__(name, bases, **kwargs)
+        return super().__prepare__(name, bases, **kwargs)
     
     def __new__(metacls, name, bases, attributes, basepath="/", **kwargs):
         """ Override for `Slotted.__new__(…)` setting up a
@@ -347,10 +356,10 @@ class BasePath(Slotted):
                                        and os.fspath(basepath) \
                                                   or basepath)
         
-        return super(BasePath, metacls).__new__(metacls, name,
-                                                         bases,
-                                                         attributes,
-                                                       **kwargs)
+        return super().__new__(metacls, name,
+                                        bases,
+                                        attributes,
+                                      **kwargs)
 
 class AppName(abc.ABC):
     
@@ -364,7 +373,7 @@ class AppName(abc.ABC):
         from clu.predicates import mro, attr_search
         if 'appspace' in kwargs:
             del kwargs['appspace']
-        super(AppName, cls).__init_subclass__(**kwargs)
+        super().__init_subclass__(**kwargs)
         cls.appname = ValueDescriptor(appname or attr_search('appname', *mro(cls)))
     
     def __init__(self, *args, **kwargs):

{python_clu-0.10.1 → python_clu-0.11.2}/clu/config/abc.py

@@ -32,6 +32,7 @@ export = exporter.decorator()
 @export
 class FrozenKeyMapBase(collections.abc.Mapping,
                        collections.abc.Reversible,
+                       clu.abstract.Serializable,
                        metaclass=clu.abstract.Slotted):
     
     """ Abstract sub-base interface class for immutable namespaced mappings.

{python_clu-0.10.1 → python_clu-0.11.2}/clu/config/keymapview.py

@@ -22,6 +22,7 @@ exporter = Exporter(path=__file__)
 export = exporter.decorator()
 
 typename = lambda thing: type(thing).__name__
+set_returner = lambda self, iterable: set(iterable)
 
 @export
 class KeyMapViewBase(collections.abc.Sequence,
@@ -88,10 +89,7 @@ class KeyMapKeysView(KeyMapViewBase,
     
     """ A KeyMap key view. """
     
-    @classmethod
-    def _from_iterable(cls, iterable): # pragma: no cover
-        # Required by the “collections.abc.Set” API:
-        return set(iterable)
+    _from_iterable = classmethod(set_returner)
     
     def __contains__(self, nskey):
         return nskey in self.mapping.submap(*self.namespaces)
@@ -108,10 +106,7 @@ class KeyMapItemsView(KeyMapViewBase,
     
     """ A KeyMap items view. """
     
-    @classmethod
-    def _from_iterable(cls, iterable): # pragma: no cover
-        # Required by the “collections.abc.Set” API:
-        return set(iterable)
+    _from_iterable = classmethod(set_returner)
     
     def __contains__(self, item):
         nskey, value = item
@@ -170,10 +165,7 @@ class NamespaceWalkerKeysView(NamespaceWalkerViewBase,
     
     """ A keys view specifically tailored to NamespaceWalker types. """
     
-    @classmethod
-    def _from_iterable(cls, iterable): # pragma: no cover
-        # Required by the “collections.abc.Set” API:
-        return set(iterable)
+    _from_iterable = classmethod(set_returner)
     
     def __contains__(self, nskey):
         for *namespaces, key, value in self.mapping.walk():
@@ -194,10 +186,7 @@ class NamespaceWalkerItemsView(NamespaceWalkerViewBase,
     
     """ An items view specifically tailored to NamespaceWalker types. """
     
-    @classmethod
-    def _from_iterable(cls, iterable): # pragma: no cover
-        # Required by the “collections.abc.Set” API:
-        return set(iterable)
+    _from_iterable = classmethod(set_returner)
     
     def __contains__(self, item):
         nskey, putative = item

{python_clu-0.10.1 → python_clu-0.11.2}/clu/fs/filesystem.py

@@ -1057,7 +1057,7 @@ class cd(Directory):
     def __init__(self, pth):
         """ Change to a new directory (the target path `pth` must be specified).
         """
-        super(cd, self).__init__(pth)
+        super().__init__(pth)
 
 @export
 class wd(Directory):
@@ -1065,7 +1065,7 @@ class wd(Directory):
     def __init__(self):
         """ Initialize a Directory instance for the current working directory.
         """
-        super(wd, self).__init__(pth=None)
+        super().__init__(pth=None)
 
 @export
 class td(Directory):
@@ -1074,7 +1074,7 @@ class td(Directory):
         """ Initialize a Directory instance for the current temporary directory.
         """
         from tempfile import gettempdir
-        super(td, self).__init__(pth=gettempdir())
+        super().__init__(pth=gettempdir())
 
 @export
 class hd(Directory):
@@ -1082,7 +1082,7 @@ class hd(Directory):
     def __init__(self):
         """ Initialize a Directory instance for the current user’s home directory.
         """
-        super(hd, self).__init__(pth=gethomedir())
+        super().__init__(pth=gethomedir())
 
 @export
 class TemporaryDirectory(Directory):
@@ -1128,7 +1128,7 @@ class TemporaryDirectory(Directory):
         self.prefix = prefix
         self.suffix = suffix
         self.change = change
-        super(TemporaryDirectory, self).__init__(self._name)
+        super().__init__(self._name)
     
     @property
     def name(self):
@@ -1150,7 +1150,7 @@ class TemporaryDirectory(Directory):
     
     @wraps(Directory.ctx_prepare)
     def ctx_prepare(self):
-        change = super(TemporaryDirectory, self).ctx_prepare().change
+        change = super().ctx_prepare().change
         self.will_change = self.will_change_back = bool(self.will_change and change)
         return self
     
@@ -1166,7 +1166,7 @@ class TemporaryDirectory(Directory):
         """ Delete the directory pointed to by the TemporaryDirectory
             instance, and everything it contains. USE WITH CAUTION.
         """
-        out = super(TemporaryDirectory, self).close()
+        out = super().close()
         if self.exists:
             return rm_rf(self.name) and out
         return False
@@ -1184,11 +1184,11 @@ class TemporaryDirectory(Directory):
     def __enter__(self):
         if not self.exists:
             self.makedirs()
-        super(TemporaryDirectory, self).__enter__()
+        super().__enter__()
         return self
     
     def __exit__(self, exc_type=None, exc_val=None, exc_tb=None):
-        out = super(TemporaryDirectory, self).__exit__(exc_type, exc_val, exc_tb)
+        out = super().__exit__(exc_type, exc_val, exc_tb)
         if self.destroy:
             out &= self.close()
         return out

{python_clu-0.10.1 → python_clu-0.11.2}/clu/fs/pypath.py

@@ -26,16 +26,19 @@ def add_paths(*putatives, prepend=False):
     paths = frozenset(sys.path)
     add_paths.oldpaths.append(tuple(sys.path))
     for pth in (os.fspath(putative) for putative in putatives):
-        if not os.path.exists(pth):
-            out[pth] = False
-            continue
         # if pth in paths:
         #     out[pth] = False
         #     continue
         for p in paths:
+            if not os.path.exists(p):
+                out[pth] = False
+                continue
             if os.path.samefile(p, pth):
                 out[pth] = False
                 continue
+        if not os.path.exists(pth):
+            out[pth] = False
+            continue
         if prepend:
             sys.path.insert(0, pth)
         else:
@@ -54,7 +57,7 @@ def mutate_syspath(container):
     for path in sys.path:
         if path in container:
             new_syspath.append(path)
-    sys.path = new_syspath
+    sys.path[:] = new_syspath
     return new_syspath
 
 @export

{python_clu-0.10.1 → python_clu-0.11.2}/clu/importing/base.py

@@ -186,7 +186,7 @@ class Registry(abc.ABC, metaclass=MetaRegistry):
             dictionary, indexed by the qualified name.
         """
         # Call up:
-        super(Registry, cls).__init_subclass__(**kwargs)
+        super().__init_subclass__(**kwargs)
         
         # We were called with a class for which the values
         # of appname, appspace, and __name__ have been assigned –
@@ -216,8 +216,8 @@ class ModuleSpec(importlib.machinery.ModuleSpec):
             are required arguments).
         """
         _, packagename = dotpath_split(name)
-        super(ModuleSpec, self).__init__(name, loader,
-                                         origin=packagename)
+        super().__init__(name, loader,
+                         origin=packagename)
     
     def __hash__(self):
         return hash(self.loader) \
@@ -234,7 +234,7 @@ class Package(types.Module):
     """
     
     def __init__(self, name, doc=None, path=None):
-        super(Package, self).__init__(name, doc)
+        super().__init__(name, doc)
         self.__path__ = path or []
     
     def __repr__(self):
@@ -593,9 +593,9 @@ class MetaModule(MetaRegistry):
         deferred_export.__doc__ = inspect.getdoc(ExporterBase.export)
         
         # Call up:
-        attributes = super(MetaModule, metacls).__prepare__(name,
-                                                            bases,
-                                                          **kwargs)
+        attributes = super().__prepare__(name,
+                                         bases,
+                                       **kwargs)
         
         # Return a new Namespace with the deferred export function
         # defined as “export”:
@@ -610,10 +610,10 @@ class MetaModule(MetaRegistry):
         deferred_export = attributes.pop('export', None)
         
         # Call up, creating and initializing the module class:
-        cls = super(MetaModule, metacls).__new__(metacls, name,
-                                                          bases,
-                                                          dict(attributes),
-                                                        **kwargs)
+        cls = super().__new__(metacls, name,
+                                       bases,
+                                       dict(attributes),
+                                     **kwargs)
         
         # If an appname is defined, try to install
         # an instance of the appropriate Exporter:
@@ -749,7 +749,7 @@ class ModuleBase(Package, Registry, metaclass=MetaModule):
         cls.appname  = appname  or attr_search('appname',  *ancestors)
         cls.appspace = appspace or attr_search('appspace', *ancestors)
         cls.__loader__ = linkages.get(cls.appname, none_function)()
-        super(ModuleBase, cls).__init_subclass__(**kwargs)
+        super().__init_subclass__(**kwargs)
     
     @classmethod
     def __class_getitem__(cls, key):
@@ -767,7 +767,7 @@ class ModuleBase(Package, Registry, metaclass=MetaModule):
         qualified_name = None
         if self.prefix:
             qualified_name = dotpath_join(self.prefix, name)
-        super(ModuleBase, self).__init__(qualified_name or name, doc)
+        super().__init__(qualified_name or name, doc)
     
     def __execute__(self):
         """ The “__execute__()” class-based module instance method is called
@@ -813,8 +813,7 @@ class ModuleBase(Package, Registry, metaclass=MetaModule):
         cls = type(self)
         if hasattr(cls, consts.EXPORTER_NAME):
             return getattr(cls, consts.EXPORTER_NAME).dir_function()()
-        names = chain(cls.__dict__.keys(),
-                      super(ModuleBase, self).__dir__())
+        names = chain(cls.__dict__.keys(), super().__dir__())
         return sorted(frozenset(names) - DO_NOT_INCLUDE)
 
 @dataclass

{python_clu-0.10.1 → python_clu-0.11.2}/clu/importing/proxy.py

@@ -201,7 +201,7 @@ class ProxyModule(ModuleBase):
             See the main class docstring for the deets.
         """
         # Call up, creating the instance:
-        instance = super(ProxyModule, cls).__new__(cls)
+        instance = super().__new__(cls)
         
         # Fill in our “slots” with empty structs:
         instance.__filters__ = []
@@ -238,7 +238,7 @@ class ProxyModule(ModuleBase):
             mappings.
         """
         # Super-initialize:
-        super(ProxyModule, self).__init__(name, doc=doc)
+        super().__init__(name, doc=doc)
         
         # Get a reference to the module class:
         cls = type(self)

{python_clu-0.10.1 → python_clu-0.11.2}/clu/scripts/repl.py

@@ -99,8 +99,8 @@ mods = ('clu',
         'sys', 'os', 'io', 're', 'abc',
         'argparse', 'collections', 'contextlib', 'copy',
         'datetime', 'functools', 'importlib', 'inspect',
-        'itertools', 'math', 'operator', 'pickle', 'six',
-        'shutil', 'sysconfig', 'weakref',
+        'itertools', 'math', 'operator', 'pathlib',
+        'pickle', 'six', 'shutil', 'sysconfig', 'weakref',
         'numpy', 'more_itertools', 'colorama', 'termcolor',
         'xerox', 'zict', 'pytz', 'dateutil',
         'termplotlib', 'termtables')
@@ -131,6 +131,7 @@ import collections.abc
 from PIL import Image
 from pprint import pprint, pformat
 
+pp = pprint
 ppt = lambda thing: pprint(tuple(thing))
 
 # These two imports trigger module-level __getattr__ actions:

{python_clu-0.10.1 → python_clu-0.11.2}/clu/scripts/treeline.py

@@ -114,7 +114,7 @@ class NodeBase(collections.abc.Hashable,
         instance.child_nodes = {}
         
         if children:
-            self._append_nodes(*children)
+            instance._append_nodes(*children)
         
         return instance
     

{python_clu-0.10.1 → python_clu-0.11.2}/noxfile.py

@@ -13,7 +13,7 @@ nox.options.stop_on_first_error = True
 # Skip manifest check if we’re not running in a Git repo:
 from clu.version.git_version import are_we_gitted
 if not are_we_gitted():
-    nox.options.keywords += "not checkmanifest"
+    nox.options.keywords = "not checkmanifest"
 
 @nox.session
 def checkmanifest(session):
@@ -93,7 +93,7 @@ def coverage(session):
                        'clu.scripts.repl'):
         session.run('coverage',
                     'run', '--append', '-m', modulename,
-                    silent=True)
+                     silent=True)
     
     # Run each inline-test function:
     for modulename in clu.all.inline_tests():

{python_clu-0.10.1 → python_clu-0.11.2}/python_clu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.10.1
+Version: 0.11.2
 Summary: CLU - Common Lightweight Utilities, or Command-Line Utilities (your pick)
 Home-page: https://github.com/fish2000/clu
 Download-URL: https://github.com/fish2000/clu/zipball/master

{python_clu-0.10.1 → python_clu-0.11.2}/setup.py

@@ -3,7 +3,7 @@
 #    
 #    CLU -- Common Lightweight Utilities
 #    
-#    Copyright © 2012-2025 Alexander Böhn
+#    Copyright © 2012-2035 Alexander Böhn
 #    
 #    Permission is hereby granted, free of charge, to any person obtaining a copy 
 #    of this software and associated documentation files (the "Software"), to deal 
@@ -91,7 +91,7 @@ try:
             '__version__.py')).read(),
             '__version__.py', 'exec'))
 except:
-    __version__ = '0.10.1'
+    __version__ = '0.11.2'
 
 # PROJECT DESCRIPTION
 LONG_DESCRIPTION = project_content('ABOUT.md')

python_clu-0.10.1/clu/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.10.1'