python-clu 0.12.15__tar.gz → 0.12.17__tar.gz

{python_clu-0.12.15 → python_clu-0.12.17}/.bumpversion.toml

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

{python_clu-0.12.15 → python_clu-0.12.17}/CHANGELOG.md

@@ -1,7 +1,105 @@
 # Changelog
 
 
-## 0.12.14:pre29+g3c4002c [SNAPSHOT]
+## 0.12.16:pre10+gf42970e [SNAPSHOT]
+
+### Fix
+
+* Fixed “include” segment in `pyproject.toml` [Alexander Böhn]
+
+### Add
+
+* Added a license URL to `pyproject.toml` [Alexander Böhn]
+
+### Other
+
+* Moving around the “xerox” dependency. [Alexander Böhn]
+
+* Trying not to have to build anything upon install. [Alexander Böhn]
+
+* Brushing up some command-endpoint-related stuff. [Alexander Böhn]
+
+* Making the `pyproject.toml` validator moew OCD-ish. [Alexander Böhn]
+
+  … we install an external bundle of other schemas people have made
+    for this validator (which thank fuck someone else did this, it
+    has to be the boringest thing in the world to write these things
+    in, like, my opinion – more power to those who feel otherwise).
+
+* Finally got the `nox` behavior for which I was looking. [Alexander Böhn]
+
+  … just didn’t want to run `coverage` by default, is all, ah.
+
+* Capitalized key names in `project.urls`, within `pyproject.toml` [Alexander Böhn]
+
+* Didn’t need •that• anymore. [Alexander Böhn]
+
+  … a minor dead-code cleanup.
+
+
+## v0.12.16 (2025-08-27)
+
+### Tweaks
+
+* Tweaked many things, in the name of speeeeeed. [Alexander Böhn]
+
+### Add
+
+* Added a missing __slots__ attribute to some abstract classes. [Alexander Böhn]
+
+  … dunno if that was possibly causing issues, but you never know
+
+### Remove
+
+* Removed several more gratuitous error-checks on initialization. [Alexander Böhn]
+
+  … these are all those that look for TypeErrors in  “__init__(…)” or
+    “__new__(…)” methods. Best to do without, so far, yes.
+
+* Removed the vestigial “more-itertools” package requirement. [Alexander Böhn]
+
+* Removed the “six” package requirement. [Alexander Böhn]
+
+  … yaaaaaay!
+
+### Other
+
+* Bumped version: 0.12.15 → 0.12.16. [Alexander Böhn]
+
+* [make] Changelog updated @ 3ba5ee3. [Alexander Böhn]
+
+* Miscellany. [Alexander Böhn]
+
+  … some kwarg-passing here, some import-trimming there. NBD.
+
+* This should be the last of the problematic initializer error-checks. [Alexander Böhn]
+
+* Killed dead code. [Alexander Böhn]
+
+* Simplified more initializers. [Alexander Böhn]
+
+* Simplified `clu.config.keymap.FrozenFlat.__init__(…)`’s `super()` call. [Alexander Böhn]
+
+  … I have this weird habit of catchint TypeErrors whenever I do a
+    “super().__init__(…)” call, because I originally wanted to work
+    around some fucked-up PyPy3 bug that necessitated doing that,
+    basically. But it’s dumb and probably hiding real problems, so
+    let’s no longer do that. Yes.
+
+* Updated the `clu.repl.ansi` enums to use `clu.abstract.Appreciative` [Alexander Böhn]
+
+  … The base type was using a really clumsy “is_ansi(…)” class method
+    to do this – that exact same clumsy function is now an offical
+    “appreciates(…)” method (see the ABC in question!) and the call
+    sites have been updated accordingly too. Now all that needs to
+    happen is the method itself has to get totally rewritten. Yes!
+
+* A very small update. [Alexander Böhn]
+
+  … allegedly, “{}” creates an empty dict faster than “dict()” does
+
+
+## v0.12.15 (2025-07-06)
 
 ### New
 
@@ -48,6 +146,10 @@
 
 ### Other
 
+* Bumped version: 0.12.14 → 0.12.15. [Alexander Böhn]
+
+* [make] Changelog updated @ 3c4002c. [Alexander Böhn]
+
 * That inline test was better as a precheck function. [Alexander Böhn]
 
 * Got `clu.config.codecs` working with annotated dicts. [Alexander Böhn]

{python_clu-0.12.15 → python_clu-0.12.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.12.15
+Version: 0.12.17
 Summary: Python-CLU: Common Lightweight Utilities
 Home-page: https://github.com/fish2000/clu
 Download-URL: https://github.com/fish2000/clu/zipball/master
@@ -8,13 +8,14 @@ Author: Alexander Böhn
 Author-email: Alexander Böhn <fish2000@gmail.com>
 Maintainer-email: Alexander Böhn <fish2000@gmail.com>
 License-Expression: LicenseRef-CLU-MIT
-Project-URL: homepage, https://github.com/fish2000/CLU
-Project-URL: repository, https://github.com/fish2000/CLU
-Project-URL: documentation, https://github.com/fish2000/CLU/blob/master/README.md
-Project-URL: source, https://github.com/fish2000/CLU
-Project-URL: tracker, https://github.com/fish2000/CLU/issues
-Project-URL: changelog, https://github.com/fish2000/CLU/blob/master/CHANGELOG.md
-Project-URL: download, https://pypi.org/project/python-clu/
+Project-URL: Homepage, https://github.com/fish2000/CLU
+Project-URL: Repository, https://github.com/fish2000/CLU
+Project-URL: Documentation, https://github.com/fish2000/CLU/blob/master/README.md
+Project-URL: Source, https://github.com/fish2000/CLU
+Project-URL: Tracker, https://github.com/fish2000/CLU/issues
+Project-URL: Changelog, https://github.com/fish2000/CLU/blob/master/CHANGELOG.md
+Project-URL: Download, https://pypi.org/project/python-clu/
+Project-URL: License, https://github.com/fish2000/CLU/blob/master/LICENSE.txt
 Keywords: testing,command,command-line,utilities,modules,REPL,tools
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
@@ -42,7 +43,6 @@ Requires-Dist: enum34>=1.1.0; python_version < "3.4"
 Requires-Dist: humanize>=1.0.0
 Requires-Dist: importlib-metadata>=1.4.0; python_version < "3.8"
 Requires-Dist: mock>=4.0.0
-Requires-Dist: more_itertools>=8.0.0
 Requires-Dist: multidict>=4.7.0
 Requires-Dist: packaging
 Requires-Dist: pout>=0.8.13
@@ -50,17 +50,16 @@ Requires-Dist: pygments>=2.0.0
 Requires-Dist: PyYAML>=5.3.0
 Requires-Dist: redis>=3.4.0
 Requires-Dist: setuptools>=30.0.0
-Requires-Dist: six>=1.10.0
 Requires-Dist: toml>=0.10.0
 Requires-Dist: tomli>=2.2.0
 Requires-Dist: tomli_w>=1.2.0
 Requires-Dist: wheel>=0.34.0
 Requires-Dist: zict>=0.1.2
 Provides-Extra: all
-Requires-Dist: more_itertools>=8.0.0; extra == "all"
 Requires-Dist: numpy>=1.17.0; extra == "all"
 Requires-Dist: Pillow>=7.1.0; extra == "all"
 Requires-Dist: pytest>=5.4.0; extra == "all"
+Requires-Dist: xerox>=0.4.0; extra == "all"
 Requires-Dist: zipp>=2.0.0; extra == "all"
 Dynamic: author
 Dynamic: download-url

python_clu-0.12.17/clu/__version__.py

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

{python_clu-0.12.15 → python_clu-0.12.17}/clu/abstract.py

@@ -118,7 +118,6 @@ class Appreciative(abc.ABC):
         class will assume that classes will appreciate… something
         like that. OK? OK.
     """
-    
     __slots__ = tuple()
     
     @classmethod
@@ -126,6 +125,13 @@ class Appreciative(abc.ABC):
     def appreciates(cls, instance):
         """ Boolean, tests if the class “appreciates” an instance """
         ...
+    
+    @classmethod
+    def __subclasshook__(cls, subcls):
+        if cls is Appreciative:
+            appreciates = getattr(subcls, 'appreciates', None)
+            return callable(appreciates)
+        return NotImplemented
 
 class Format(collections.abc.Callable, metaclass=Slotted):
     
@@ -179,6 +185,7 @@ class Serializable(abc.ABC):
         class. This dict is based on the class, and contains whatever the
        “from_dict(…)” method expects.
     """
+    __slots__ = tuple()
     
     @classmethod
     def from_dict(cls, instance_dict):
@@ -262,6 +269,7 @@ class SlottedRepr(ReprWrapper, metaclass=Slotted):
         inheritance chain’s value for “__slots__” to build the repr
         string for its instances
     """
+    __slots__ = tuple()
     
     def inner_repr(self):
         """ Use the union of __slots__, defined across this classes’
@@ -278,6 +286,7 @@ class MappingViewRepr(ReprWrapper):
     """ A ReprWrapper class that simply returns the repr for a
         “self._mapping” value – of which most MappingView types make use.
     """
+    __slots__ = tuple()
     
     def inner_repr(self): # pragma: no cover
         """ Return the repr string for “self._mapping” """
@@ -364,6 +373,7 @@ class ValueDescriptor(Descriptor):
     """ A descriptor whose repr-string tries to be a literal reflection
         of its wrapped value
     """
+    __slots__ = tuple()
     
     def __repr__(self):
         """ A custom repr for the ValueDescriptor’s literal value """

{python_clu-0.12.15 → python_clu-0.12.17}/clu/config/abc.py

@@ -164,14 +164,26 @@ class FrozenKeyMap(FrozenKeyMapBase):
     
     def submap(self, *namespaces, unprefixed=False):
         """ Return a flattened dict containing only the namespaced items. """
+        # Get the frozen version of this class:
         cls = freeze_class(type(self))
+        
+        # Shortcut for unprefixed keys:
         if unprefixed:
-            return cls({ nskey : self[nskey] for nskey in self if NAMESPACE_SEP not in nskey })
+            return cls({ nskey : self[nskey] \
+                     for nskey in self \
+                      if NAMESPACE_SEP not in nskey })
+        
+        # Shortcut for a lack of namespaces:
         if not namespaces:
             return cls(self)
-        out = dict()
+        
+        # Iterate namespaces, taking those matching our namespaces
+        # for a new instance:
+        out = {}
         for namespace in namespaces:
-            out.update({ nskey : self[nskey] for nskey in self if nskey.startswith(namespace) })
+            out.update({ nskey : self[nskey] \
+                     for nskey in self \
+                      if nskey.startswith(namespace) })
         return cls(out)
     
     def keys(self, *namespaces, unprefixed=False):
@@ -205,7 +217,9 @@ class FrozenKeyMap(FrozenKeyMapBase):
         return hash(tuple(self.keys())) ^ len(self)
     
     def _get_namespace_foset(self):
-        return FlatOrderedSet(get_ns(nskey) for nskey in sorted(self) if NAMESPACE_SEP in nskey)
+        return FlatOrderedSet(get_ns(nskey) \
+            for nskey in self \
+             if NAMESPACE_SEP in nskey)
     
     def namespaces(self):
         yield from self._get_namespace_foset()
@@ -374,10 +388,12 @@ class NamespaceWalker(FrozenKeyMap):
         if cls is None:
             from clu.config.keymap import FrozenFlat
             cls = FrozenFlat
-        return cls({ pack_ns(key, *fragments) : value for *fragments, key, value in self.walk() })
+        return cls({ pack_ns(key, *fragments) : value \
+            for *fragments, key, value in self.walk() })
     
     def _get_namespace_foset(self):
-        return FlatOrderedSet(concatenate_ns(*fragments) for *fragments, _, _ in self.walk() if fragments)
+        return FlatOrderedSet(concatenate_ns(*fragments) \
+            for *fragments, _, _ in self.walk() if fragments)
     
     def keys(self, *namespaces, unprefixed=False):
         """ Return a namespaced view over either all keys in the mapping,
@@ -479,9 +495,8 @@ class FlatOrderedSet(collections.abc.Set,
         """ Used by `clu.config.codecs` to deserialize FlatOrderedSets """
         out = cls()
         out.things = tuple(instance_dict['things'])
+        out.predicate = qualified_import(instance_dict['predicate'])
         return out
-        # return cls(*instance_dict['things'],
-        #             predicate=qualified_import(instance_dict['predicate']))
     
     @classmethod
     def appreciates(cls, instance):
@@ -618,7 +633,8 @@ class FlatOrderedSet(collections.abc.Set,
     def clone(self, deep=False, memo=None):
         copier = getattr(copy, deep and 'deepcopy' or 'copy')
         out = type(self)()
-        out.things = tuple(map(copier, self.things))
+        out.things = copier(self.things)
+        out.predicate = self.predicate
         return out
     
     def inner_repr(self):

{python_clu-0.12.15 → python_clu-0.12.17}/clu/config/env.py

@@ -72,10 +72,7 @@ class FrozenEnviron(NamespaceWalker, clu.abstract.ReprWrapper,
         """ Initialize a FrozenKeyMap instance wrapping an environment-variable
             dictionary from a target dictionary, with a supplied appname.
         """
-        try:
-            super().__init__(**updates)
-        except TypeError:
-            super().__init__()
+        super().__init__()
         self.appname = appname or APPNAME
         self.environment = environment is None \
                        and os.environ.copy() \
@@ -142,13 +139,10 @@ class Environ(FrozenEnviron, KeyMap, contextlib.AbstractContextManager):
         """
         if environment is None:
             environment = os.environ
-        try:
-            super().__init__(environment=environment,
-                                 appname=appname,
-                                       **updates)
-        except TypeError:
-            super().__init__(environment=environment,
-                                 appname=appname)
+        
+        super().__init__(environment=environment,
+                             appname=appname,
+                                   **updates)
         self.stash = None
     
     def freeze(self):

{python_clu-0.12.15 → python_clu-0.12.17}/clu/config/filebase.py

@@ -177,10 +177,8 @@ class FileBase(Nested, FileName): # type: ignore
         extra_user_dirs = kwargs.pop('extra_user_dirs', None)
         search_sys_path = kwargs.pop('search_sys_path', False)
         
-        try:
-            super(FileBase, self).__init__(*args, **kwargs)
-        except TypeError:
-            super(FileBase, self).__init__()
+        # Call super:
+        super(FileBase, self).__init__(*args, **kwargs)
         
         if isvalidpath(filepath):
             self.filepath = filepath

{python_clu-0.12.15 → python_clu-0.12.17}/clu/config/keymap.py

@@ -62,10 +62,7 @@ class FrozenFlat(abc.FrozenKeyMap, clu.abstract.ReprWrapper,
             output of ‘pack_ns(…)’ (q.v. function definition supra.)
         """
         # Call up:
-        try:
-            super().__init__(**updates)
-        except TypeError:
-            super().__init__()
+        super().__init__(**updates)
         
         # Sort out our passed-in dictionary:
         if hasattr(dictionary, 'dictionary'):
@@ -170,9 +167,8 @@ class FrozenNested(abc.NamespaceWalker, clu.abstract.ReprWrapper,
     @classmethod
     def from_dict(cls, instance_dict):
         """ Used by `clu.config.codecs` to deserialize keymaps """
-        out = cls()
+        out = cls(nskeyset=instance_dict.get('nskeyset', None))
         out.tree = instance_dict['tree']
-        out.nskeys = instance_dict['nskeyset']
         return out
     
     def __init__(self, tree=None, *, nskeyset=None, **updates):
@@ -180,10 +176,7 @@ class FrozenNested(abc.NamespaceWalker, clu.abstract.ReprWrapper,
             target nested dictionary (or a “tree” of dicts).
         """
         # Call up:
-        try:
-            super().__init__(**updates)
-        except TypeError:
-            super().__init__()
+        super().__init__()
         
         # Sort out the nature of the input:
         if hasattr(tree, 'tree'):
@@ -192,7 +185,7 @@ class FrozenNested(abc.NamespaceWalker, clu.abstract.ReprWrapper,
             tree = getattr(tree.nestify(), 'tree')
         
         # Assign, and deal with updates:
-        self.tree = dictify(tree or {}, cls=dict)
+        self.tree = dictify(tree or {})
         if updates:
             for nskey, value in updates.items():
                 key, fragments = ns.unpack_ns(nskey)
@@ -206,7 +199,7 @@ class FrozenNested(abc.NamespaceWalker, clu.abstract.ReprWrapper,
                 d[key] = value
         
         # Keep the keyset we got:
-        self.nskeys = nskeyset
+        self.nskeys = nskeyset and frozenset(nskeyset) or None
     
     def walk(self):
         """ Iteratively walk the nested KeyMap’s tree of dicts. """
@@ -222,7 +215,7 @@ class FrozenNested(abc.NamespaceWalker, clu.abstract.ReprWrapper,
         return thaw_class(type(self))(tree=copy.copy(self.tree),
                                   nskeyset=copy.copy(self.nskeys))
     
-    def submap(self, *namespaces, unprefixed=False, cls=False):
+    def submap(self, *namespaces, unprefixed=False, cls=None):
         """ Return a flattened mapping, if possible a mutable one,
             containing only items with keys matching the specified
             namespaces (as namespaced:key:paths).
@@ -233,7 +226,7 @@ class FrozenNested(abc.NamespaceWalker, clu.abstract.ReprWrapper,
         
         # Short-circuit for returning unprefixed top-level items:
         if unprefixed:
-            return cls({ key : value \
+            return cls({ key: value \
                      for key, value in self.tree.items() \
                          if not ismapping(value) })
         
@@ -298,10 +291,7 @@ class Nested(FrozenNested, abc.KeyMap):
             target nested dictionary (or a “tree” of dicts).
         """
         # Call up, without passing nskeyset:
-        try:
-            super().__init__(tree=tree, nskeyset=None, **updates)
-        except TypeError:
-            super().__init__()
+        super().__init__(tree=tree, nskeyset=None, **updates)
         
         # Mutable-ize the keyset:
         self.nskeys = nskeyset and set(nskeyset) or set(self.nskeyset())

{python_clu-0.12.15 → python_clu-0.12.17}/clu/dicts.py

@@ -108,10 +108,7 @@ class ChainRepr(Repr):
         """ Initialize a ChainRepr, with default params
             for ‘maxlevel’, ‘maxstring’, and ‘maxother’.
         """
-        try:
-            super().__init__(*args, **kwargs)
-        except TypeError:
-            super().__init__()
+        super().__init__(*args, **kwargs)
         self.maxlevel = maxlevel
         self.maxstring = maxstring
         self.maxother = maxother

{python_clu-0.12.15 → python_clu-0.12.17}/clu/enums.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
+import abc
 import clu.abstract
+import collections.abc
 
 from clu.constants.polyfills import Enum, EnumMeta # type: ignore
 from clu.exporting import Exporter
@@ -101,7 +103,7 @@ class alias(clu.abstract.BaseDescriptor, metaclass=clu.abstract.Slotted):
             cls.__aliases__[self.name] = self.member_for_value(cls, self.aliased)
 
 @export
-class AliasingEnumMeta(EnumMeta):
+class AliasingEnumMeta(EnumMeta, abc.ABCMeta):
     
     def __new__(metacls, name, bases, attributes, **kwargs):
         """ Ensure `__aliases__` is a dictionary attribute on the new class.

{python_clu-0.12.15 → python_clu-0.12.17}/clu/exporting.py

@@ -316,9 +316,12 @@ class Registry(abc.ABC, metaclass=clu.abstract.Slotted):
             appname = determine_name(cls)
         else:
             if appname in classes:
-                raise TypeError(f"appname already registered: {appname}")
-            appnames.add(appname)
-            classes[appname] = cls
+                # raise TypeError(f"appname already registered: {appname}")
+                warnings.warn(f"appname already registered: “{appname}”",
+                                ExportWarning, stacklevel=2)
+            else:
+                appnames.add(appname)
+                classes[appname] = cls
         super().__init_subclass__(**kwargs) # type: ignore
         cls.instances = weakref.WeakValueDictionary()
         cls.appname = clu.abstract.ValueDescriptor(appname)
@@ -434,10 +437,8 @@ class ExporterBase(collections.abc.MutableMapping,
             if putative in cls.instances:
                 return cls.instances[putative]
         
-        try:
-            instance = super().__new__(cls, *args, **kwargs) # type: ignore
-        except TypeError:
-            instance = super().__new__(cls)
+        # Call super:
+        instance = super().__new__(cls) # type: ignore
         
         instance.__exports__ = {}
         instance.path = path

{python_clu-0.12.15 → python_clu-0.12.17}/clu/fs/sourcetree.py

@@ -23,10 +23,8 @@ class SourceTree(abc.ABC, metaclass=Slotted):
     __slots__ = ('directory', 'header_lines', 'filepath')
     
     def __init__(self, filepath, path=None, **kwargs):
-        try:
-            super(SourceTree, self).__init__(**kwargs)
-        except TypeError:
-            super(SourceTree, self).__init__()
+        # Call super:
+        super(SourceTree, self).__init__(**kwargs)
         
         # Check the “srctree” file:
         if not os.path.isfile(filepath):

{python_clu-0.12.15 → python_clu-0.12.17}/clu/importing/base.py

@@ -374,10 +374,7 @@ class LoaderBase(clu.abstract.AppName,
         # Create and register a new loader, as per the
         # arguments with which to initialize this new
         # loader instance:
-        try:
-            cls.instances[key] = instance = super().__new__(cls, *args, **kwargs)
-        except TypeError:
-            cls.instances[key] = instance = super().__new__(cls)
+        cls.instances[key] = instance = super().__new__(cls, *args, **kwargs)
         
         # Return the newly created instance:
         return instance

{python_clu-0.12.15 → python_clu-0.12.17}/clu/predicates.py

@@ -275,10 +275,7 @@ class Partial(partial):
     def __init__(self, *args, **kwargs):
         """ Initialize a new Partial object, with a predicate and a function """
         # N.B. The real action seems to happen in partial.__new__(…)
-        try:
-            super().__init__(*args, **kwargs)
-        except:
-            super().__init__() # type: ignore
+        super().__init__()
         
         # Name the Partial instance, as if it’s a phi-type:
         self.__name__ = self.__qualname__ = φ

{python_clu-0.12.15 → python_clu-0.12.17}/clu/repl/ansi.py

@@ -18,7 +18,7 @@ from clu.predicates import mro, or_none
 from clu.typology import dict_types, isstring, isbytes
 from clu.fs.misc import re_matcher
 from clu.naming import nameof, qualified_name, isinspectable
-from clu.enums import alias, AliasingEnumMeta
+from clu.enums import alias, AliasingEnum, AliasingEnumMeta
 from clu.stdio import std, linebreak, flush_all
 from clu.exporting import Exporter
 
@@ -28,12 +28,14 @@ export = exporter.decorator()
 print_separator = lambda filler='-': print(filler * SEPARATOR_WIDTH)
 
 @export
-class ANSIBase(Enum):
+class ANSIBase(clu.abstract.Appreciative, AliasingEnum):
     
     """ Root ancestor class for all ANSI-code enums """
     
     @classmethod
-    def is_ansi(cls, instance):
+    def appreciates(cls, instance):
+        """ Boolean, tests if the class “appreciates” an instance """
+        # N.B. This is far too ripe for false positives
         return cls in mro(instance)
 
 @export
@@ -133,7 +135,7 @@ class ANSI(AliasingEnumMeta):
         """ Convert a specifier of unknown type to an enum or alias member """
         if specifier is None:
             return cls.NOTHING
-        elif cls.is_ansi(specifier):
+        elif cls.appreciates(specifier):
             return specifier                        # Already an ANSI type, return it
         if isstring(specifier):
             return cls.for_name(specifier)          # Match by name, decoding if necessary
@@ -325,7 +327,7 @@ class ANSIFormat(clu.abstract.Format,
                 text = from_value
             elif isbytes(from_value):
                 text = str(from_value, encoding=ENCODING)
-            elif ANSIBase.is_ansi(from_value):
+            elif ANSIBase.appreciates(from_value):
                 text = from_value
         instance = cls.get_or_create(Text.convert(text),
                                Background.convert(background),
@@ -583,8 +585,8 @@ wrapper_kws = lambda **kwargs: { **BASE_KWARGS, **kwargs }
 @export
 class HighlighterWrapper(TextWrapper):
     
-    def __init__(self):
-        super().__init__(**wrapper_kws())
+    def __init__(self, **kwargs):
+        super().__init__(**wrapper_kws(**kwargs))
 
 @export
 class DualOptionWrapper(clu.abstract.Format):
@@ -699,10 +701,13 @@ class DocFormat(clu.abstract.Format):
             self.putpara(paragraph)
         
         self.putln(count=2)
+        return thing
     
     def __call__(self, *things):
+        out = None
         for thing in things:
-            self.render(thing)
+            out = self.render(thing)
+        return out
 
 def old_ansidoc(*things):
     """ old_ansidoc(*things) → Print the docstring value for each thing, in ANSI color """
@@ -749,6 +754,9 @@ def old_ansidoc(*things):
         linebreak()
         print()
         flush_all()
+    
+    # Return thing(s)
+    return len(things) == 1 and things[0] or things
 
 ansidoc = DocFormat()
 

{python_clu-0.12.15 → python_clu-0.12.17}/clu/repl/cli/ansidocs.py

@@ -14,7 +14,6 @@ def actually_print_ansidocs(dotpath):
         formatting accordingly (as in, no ANSI if we can’t ANSI)
     """
     from clu.naming import qualified_import
-    from importlib import import_module
     
     # Attempt to import it:
     try:
@@ -27,8 +26,7 @@ def actually_print_ansidocs(dotpath):
         sys.exit(os.EX_CONFIG)
     
     # This goes directly to stdout:
-    ansidocs(thing)
-    return thing
+    return ansidocs.render(thing)
 
 def ansidocs_command():
     """ Print out the ANSI-ified docstring for the given thing(s) """

{python_clu-0.12.15 → python_clu-0.12.17}/clu/repl/cli/boilerplate_copy.py

@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
-import sys, os
-
-from clu.repl.cli.boilerplate import boilerplate_command
+import sys, os, xerox
 
 def boilerplate_copy_command(): # pragma: no cover
-    import xerox
-    return boilerplate_command(function=xerox.copy)
+    from clu.repl.cli import boilerplate
+    return boilerplate.boilerplate_command(function=xerox.copy)
 
 if __name__ == '__main__':
     print("Copying boilerplate to clipboard…")