python-clu 0.12.7__tar.gz → 0.12.9__tar.gz

{python_clu-0.12.7 → python_clu-0.12.9}/.bumpversion.toml

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

{python_clu-0.12.7 → python_clu-0.12.9}/CHANGELOG.md

@@ -1,6 +1,79 @@
 # Changelog
 
 
+## 0.12.8:pre8+g4f192b8 [SNAPSHOT]
+
+### Add
+
+* Added a `clu.predicates.pyqualname(…)` function. [Alexander Böhn]
+
+  … which of course does exactly what you think it does, in that it
+    privliges the “__qualname__” with what it returns for whatever
+    argument thing it is passed. Have fun you guys
+
+### Other
+
+* Removed (fortunately vestigial) Click package dependency. [Alexander Böhn]
+
+* Expanded “getdoc” codepath in `clu.repl.ansi.signature(…)` [Alexander Böhn]
+
+* Using new `clu.predicates.pyqualname(…)` in `clu.naming.qualified_name(…)` [Alexander Böhn]
+
+  … this closes Issue #14! Q.v. https://github.com/fish2000/CLU/issues/14
+  … An upcoming release will demonstrate this through the “clu-ansidocs”
+    command
+
+* Special-cased `filter(…)` call should be fastest. [Alexander Böhn]
+
+  … tests do indicate as such, it appears, actually, now that you mention
+
+* More updates, cleanup, and addenda in `clu.enums` [Alexander Böhn]
+
+* The `clu.enums.alias(…)` class is now itself `clu.abstract.Slotted` [Alexander Böhn]
+
+  … as in, that is now its metaclass. This makes probably such zero
+    difference in anything in the universe it shames me to have even
+    brought this much attention to it here and now, and I really do
+    apologize, I do, yes.
+
+* Refactored `clu.naming.isnative(…)` around an edge case. [Alexander Böhn]
+
+
+## v0.12.8 (2025-05-24)
+
+### Other
+
+* Bumped version: 0.12.7 → 0.12.8. [Alexander Böhn]
+
+* [make] New changelog added. [Alexander Böhn]
+
+* Fixes in `clu.naming.{qualified_import,main_module_mame}(…)` [Alexander Böhn]
+
+  … “main_module_name(…)” was failing when called within bpython; now,
+    it’s cool
+  … “qualified_import(…)” calls itself recursively when an exception
+    is raised during an internal import call – this should mean its
+    own error-handling should keep runtime import errors from reaching
+    a user when it’s being called correctly (!)
+
+* Very slight, and likely premature, optimization. [Alexander Böhn]
+
+* Dead code cleanup. [Alexander Böhn]
+
+* Don’t want to leave that test-ish line in there. [Alexander Böhn]
+
+* A wee bit of error-handling in “clu-ansidocs” [Alexander Böhn]
+
+
+## v0.12.7 (2025-05-19)
+
+### Other
+
+* Bumped version: 0.12.6 → 0.12.7. [Alexander Böhn]
+
+* [make] New changelog added. [Alexander Böhn]
+
+
 ## v0.12.6 (2025-05-19)
 
 ### Other

{python_clu-0.12.7 → python_clu-0.12.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.12.7
+Version: 0.12.9
 Summary: Python-CLU: Common Lightweight Utilities
 Home-page: https://github.com/fish2000/clu
 Download-URL: https://github.com/fish2000/clu/zipball/master
@@ -36,7 +36,6 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: build>=1.2.2
-Requires-Dist: Click>=7.0
 Requires-Dist: colorama>=0.4.0
 Requires-Dist: dataclasses>=0.6; python_version < "3.7"
 Requires-Dist: dbx-stopwatch>=1.6

python_clu-0.12.9/clu/__version__.py

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

{python_clu-0.12.7 → python_clu-0.12.9}/clu/api/__init__.py

@@ -2,7 +2,6 @@
 from __future__ import print_function
 
 import abc
-import click
 import sys
 
 abstract = abc.abstractmethod
@@ -39,19 +38,6 @@ class CommandBase(ModuleBase):
 class Command(CommandBase[Module]):
     commandstr = "command" # …a reserved word?
 
-class CLUI(click.MultiCommand):
-    
-    def iter_commands(self, context):
-        modules = modules_for_appname_and_appspace(consts.APPNAME, API_APPSPACE)
-        yield from (module.commandname for module in modules)
-    
-    def list_commands(self, context):
-        return list(self.iter_commands(context))
-    
-    def get_command(self, context, key):
-        dotpath = dotpath_join(consts.APPNAME, API_APPSPACE, key)
-        return dotpath
-
 # Assign the modules’ `__all__` and `__dir__` using the exporter:
 __all__, __dir__ = exporter.all_and_dir()
 
@@ -60,17 +46,11 @@ def test():
     from clu.testing.utils import inline
     
     @inline
-    def test_one():
+    def test_command_imports():
         """ Command import test """
         from clu.commands import Command as command
         assert command
     
-    @inline
-    def test_two():
-        """ Sanity-check CLUI """
-        clui = CLUI()
-        assert clui
-    
     return inline.test(100)
 
 if __name__ == '__main__':

{python_clu-0.12.7 → python_clu-0.12.9}/clu/enums.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
+import clu.abstract
+
 from clu.constants.polyfills import Enum, EnumMeta # type: ignore
 from clu.exporting import Exporter
 
@@ -9,10 +11,10 @@ export = exporter.decorator()
     
 # Dunder and sunder name constants for the alias dict:
 DUNDER = '__aliases__'
-SUNDER = '_aliases_'
+MIFFLIN = SUNDER = '_aliases_'
 
 @export
-class alias(object):
+class alias(clu.abstract.BaseDescriptor, metaclass=clu.abstract.Slotted):
     
     __slots__ = ('name', 'aliased')
     
@@ -65,7 +67,7 @@ class alias(object):
         return self.member_for_value(cls, self.aliased)
     
     def __set_name__(self, cls, name):
-        """ Register the alias within the __aliases__ dict in
+        """ Register the alias within the `__aliases__` dict in
             the class (if it has one).
             
             N.B. This only gets called on Python 3.6+
@@ -102,26 +104,26 @@ class alias(object):
 class AliasingEnumMeta(EnumMeta):
     
     def __new__(metacls, name, bases, attributes, **kwargs):
-        """ Ensure __aliases__ is a dictionary attribute on the new class.
+        """ Ensure `__aliases__` is a dictionary attribute on the new class.
             
             It is not strictly necessary to make this class an ancestor to
             your enums in order to use the `alias(…)` descriptor function,
             as defined above – if you do, the enums you define with it will
-            conveniently furnish the __aliases__ dictionary, which is like
-            the normal enum __members__ directory only with aliases. Yes.
+            conveniently furnish the `__aliases__` dictionary, which is like
+            the normal enum `__members__` directory only with aliases. Yes.
         """
         
         if '__aliases__' not in attributes:
             attributes['__aliases__'] = {}
         
-        return super(AliasingEnumMeta, metacls).__new__(metacls, name,
-                                                                 bases,
-                                                                 attributes,
-                                                               **kwargs)
+        return super().__new__(metacls, name,
+                                        bases,
+                                        attributes,
+                                      **kwargs)
 
 @export
 class AliasingEnum(Enum, metaclass=AliasingEnumMeta):
-    """ An Enum subclass intermediate, suitable for subclassing
+    """ An `Enum` subclass intermediate, suitable for subclassing
         itself, that uses `AliasingEnumMeta` as its metaclass.
         
         …Thus, any member aliases that one makes in concrete
@@ -132,4 +134,4 @@ class AliasingEnum(Enum, metaclass=AliasingEnumMeta):
     pass
 
 # Assign the modules’ `__all__` and `__dir__` using the exporter:
-__all__, __dir__ = exporter.all_and_dir()
+__all__, __dir__ = exporter.all_and_dir('DUNDER', 'MIFFLIN', 'SUNDER')

{python_clu-0.12.7 → python_clu-0.12.9}/clu/naming.py

@@ -76,10 +76,20 @@ indication that you need to change something, dogg.
 
 @export
 def main_module_name(basepath=None):
+    """ Get the name of the current __main__ module (which may
+        very well just be “__main__”), but still.
+    """
     import __main__
-    if basepath is None:
+    from clu.predicates import attr
+    
+    # Default:
+    if not basepath:
         basepath = BASEPATH
-    return path_to_dotpath(__main__.__file__,
+    
+    # In some REPLs “__main__.__file__” is not set:
+    attribute_name = attr(__main__, '__file__',
+                                    '__spec__.name')
+    return path_to_dotpath(attribute_name,
                            relative_to=basepath)
 
 @export
@@ -167,12 +177,26 @@ def isnative(thing):
     """ isnative(thing) → boolean predicate, True if `thing`
         comes from a native-compiled (“extension”) module.
     """
-    module = moduleof(thing)
-    if module == 'builtins':
+    # Grab the name of the module of the thing:
+    module_name = moduleof(thing)
+    
+    # Not native:
+    if module_name == 'builtins':
         return False
-    return isnativemodule(
-           importlib.import_module(
-                            module))
+    
+    try:
+        # 99.99999999% of the time this should work
+        module = importlib.import_module(module_name)
+    except ModuleNotFoundError as error:
+        # This error indicates a native module, strangely:
+        if """named 'bin'""" in str(error):
+            return True
+    else:
+        # Delegate deciding about the module:
+        return isnativemodule(module)
+    
+    # We couldn’t figure this one out – so no false positives:
+    return False
 
 @export
 def isinspectable(thing):
@@ -225,7 +249,7 @@ def dotpath_split(dotpath):
 
 @export
 def qualified_import(qualified):
-    """ Import a qualified thing-name.
+    """ Import a thing based on its full thing-name.
         e.g. 'instakit.processors.halftone.FloydSteinberg'
     """
     if QUALIFIER not in qualified:
@@ -234,7 +258,7 @@ def qualified_import(qualified):
         imported = importlib.import_module(qualified)
     except ModuleNotFoundError:
         head, tail = dotpath_split(qualified)
-        module = importlib.import_module(tail)
+        module = qualified_import(tail)
         imported = getattr(module, head)
     return imported
 
@@ -243,16 +267,18 @@ def qualified_name_tuple(thing):
     """ Get the thing-name and module/package name for a class or module.
         e.g. ('FloydSteinberg', 'instakit.processors.halftone')
     """
-    return nameof(thing), moduleof(thing)
+    from clu.predicates import pyqualname
+    return pyqualname(thing) or nameof(thing), \
+                              moduleof(thing)
 
 @export
 def qualified_name(thing):
-    """ Get a qualified thing-name for a thing.
+    """ Get a full thing-name for a thing.
         e.g. 'instakit.processors.halftone.FloydSteinberg'
     """
     thing_name, module_name = qualified_name_tuple(thing)
-    qualname = dotpath_join(module_name, thing_name)
-    return qualname
+    fullname = dotpath_join(module_name, thing_name)
+    return fullname
 
 @export
 def dotpath_to_prefix(dotpath, sep='-', end='-'):

{python_clu-0.12.7 → python_clu-0.12.9}/clu/predicates.py

@@ -292,6 +292,7 @@ uncallable      = negate(callable) # type: ignore
 hoist           = lambda thing: uncallable(thing) and wrap_value(thing) or thing
 
 pyname          = lambda thing: pyattr(thing, 'name', 'qualname')
+pyqualname      = lambda thing: pyattr(thing, 'qualname', 'name')
 pymodule        = lambda thing: pyattr(thing, 'module', 'package')
 
 the_expandables = (tuple, list, set, frozenset,
@@ -435,7 +436,7 @@ def tuplize(*items):
 def uniquify(*items):
     """ uniquify(*items) → Return a generator yielding a unique set of all non-`None` arguments """
     seen = set() # type: set
-    for item in filter(isnotnone, items):
+    for item in filter(None, items):
         if item not in seen:
             seen.add(item)
             yield item
@@ -583,8 +584,9 @@ export(true_function,   name='true_function',   doc="true_function() → A funct
 export(false_function,  name='false_function',  doc="false_function() → A function that always returns False")
 export(uncallable,      name='uncallable',      doc="uncallable(thing) → boolean predicate, shortcut for `not callable(thing)`")
 export(hoist,           name='hoist',           doc="hoist(thing) → if “thing” isn’t already callable, turn it into a lambda that returns it as a value (using “wrap_value(…)”).")
-export(pyname,          name='pyname',          doc="pyname(thing) → Return either `__qualname__` or `__name__` from a given `thing`")
-export(pymodule,        name='pymodule',        doc="pymodule(thing) → Return either `__module__` or `__package__` from a given `thing`")
+export(pyname,          name='pyname',          doc="pyname(thing) → Return either `__qualname__` or `__name__` (in that order) from a given `thing`")
+export(pyqualname,      name='pyqualname',      doc="pyqualname(thing) → Return either `__name__` or `__qualname__` (in that order) from a given `thing`")
+export(pymodule,        name='pymodule',        doc="pymodule(thing) → Return either `__module__` or `__package__` (in that order) from a given `thing`")
 
 export(isexpandable,    name='isexpandable',    doc="isexpandable(thing) → boolean predicate, True if `thing` can be `*expanded`")
 export(isnormative,     name='isnormative',     doc="isnormative(thing) → boolean predicate, True if `thing` is a string-like or bytes-like iterable")

{python_clu-0.12.7 → python_clu-0.12.9}/clu/repl/ansi.py

@@ -493,12 +493,11 @@ def signature(thing):
     """
     try:
         return nameof(thing) + str(inspect.signature(thing))
-    except ValueError as exc:
-        if 'no signature found' in str(exc):
-            doc = inspect.getdoc(thing)
-            if doc:
-                return arrow_re.sub(arrow_sb,
-                                    doc.splitlines()[0].strip())
+    except (TypeError, ValueError):
+        doc = inspect.getdoc(thing)
+        if doc:
+            return arrow_re.sub(arrow_sb,
+                                doc.splitlines()[0].strip())
     return None
 
 @export

{python_clu-0.12.7 → python_clu-0.12.9}/clu/repl/cli/ansidocs.py

@@ -6,12 +6,14 @@ import os
 import sys
 import shlex
 
+from clu.repl.ansi import DocFormat
+ansidocs = DocFormat()
+
 def actually_print_ansidocs(dotpath):
     """ This function prints the ANSI docs directly to standard output,
         formatting accordingly (as in, no ANSI if we can’t ANSI)
     """
     from clu.naming import qualified_import
-    from clu.repl.ansi import DocFormat
     from importlib import import_module
     
     # Attempt to import it:
@@ -19,8 +21,12 @@ def actually_print_ansidocs(dotpath):
         thing = qualified_import(dotpath)
     except ValueError:
         thing = import_module(dotpath)
+    except AttributeError as error:
+        error_string = str(error)
+        print(f"[ERROR] {error_string}", file=ansidocs.iohandle)
+        sys.exit(os.EX_CONFIG)
     
-    ansidocs = DocFormat()
+    # This goes directly to stdout:
     ansidocs(thing)
 
 def ansidocs_command():
@@ -35,6 +41,7 @@ def ansidocs_command():
         alldotpaths = " ".join(dotpaths)
         print(f"EXECUTABLE: {executable}")
         print(f"DOTPATHS: {alldotpaths}")
+        print()
     
     # The actual dirty work
     for dotpath in dotpaths:
@@ -44,6 +51,4 @@ def ansidocs_command():
     return os.EX_OK
 
 if __name__ == '__main__':
-    # sys.argv.append('clu.exporting.Exporter')
-    # sys.argv.append('clu.repl.ansi.Text')
     sys.exit(ansidocs_command())

{python_clu-0.12.7 → python_clu-0.12.9}/clu/repl/cli/print_version.py

@@ -46,5 +46,4 @@ def print_version_command():
     return os.EX_OK
 
 if __name__ == '__main__':
-    # sys.argv += ['--version-only']
     sys.exit(print_version_command())

{python_clu-0.12.7 → python_clu-0.12.9}/python_clu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.12.7
+Version: 0.12.9
 Summary: Python-CLU: Common Lightweight Utilities
 Home-page: https://github.com/fish2000/clu
 Download-URL: https://github.com/fish2000/clu/zipball/master
@@ -36,7 +36,6 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: build>=1.2.2
-Requires-Dist: Click>=7.0
 Requires-Dist: colorama>=0.4.0
 Requires-Dist: dataclasses>=0.6; python_version < "3.7"
 Requires-Dist: dbx-stopwatch>=1.6

{python_clu-0.12.7 → python_clu-0.12.9}/python_clu.egg-info/requires.txt

@@ -1,5 +1,4 @@
 build>=1.2.2
-Click>=7.0
 colorama>=0.4.0
 dbx-stopwatch>=1.6
 humanize>=1.0.0

{python_clu-0.12.7 → python_clu-0.12.9}/requirements/install.txt

@@ -1,5 +1,4 @@
 build>=1.2.2
-Click>=7.0
 colorama>=0.4.0
 dataclasses>=0.6; python_version < '3.7'
 dbx-stopwatch>=1.6

{python_clu-0.12.7 → python_clu-0.12.9}/setup.py

@@ -88,7 +88,7 @@ try:
             '__version__.py')).read(),
             '__version__.py', 'exec'))
 except:
-    __version__ = '0.12.7'
+    __version__ = '0.12.9'
 
 # PROJECT DESCRIPTION
 LONG_DESCRIPTION = project_content('ABOUT.md')

python_clu-0.12.7/clu/__version__.py

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