python-clu 0.11.5__tar.gz → 0.11.6__tar.gz

{python_clu-0.11.5 → python_clu-0.11.6}/.bumpversion.toml

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

{python_clu-0.11.5 → python_clu-0.11.6}/CLASSIFIERS.txt

@@ -1,5 +1,4 @@
 Development Status :: 5 - Production/Stable
-License :: OSI Approved :: MIT License
 Framework :: Pytest
 Intended Audience :: Developers
 Topic :: Software Development

{python_clu-0.11.5 → python_clu-0.11.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.11.5
+Version: 0.11.6
 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
@@ -10,7 +10,6 @@ License: MIT
 Keywords: command utilities clu fish2000 command-line modules predicates REPL tools
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development

python_clu-0.11.6/clu/__version__.py

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

{python_clu-0.11.5 → python_clu-0.11.6}/clu/exporting.py

@@ -14,7 +14,7 @@ import importlib
 import inspect
 import itertools
 import shelve
-import sys, os
+import sys, os, re
 import warnings
 import weakref
 
@@ -106,9 +106,9 @@ def search_by_id(thingID):
         `sys.modules.values()` (which is potentially completely
         fucking enormous).
         
-        This function implements `search_for_name(…)` – q.v.
+        This function helps implement `search_for_name(…)` – q.v.
         the calling function code sub., and is also used in the
-        implementation of `determine_module(…)`, - also q.v.
+        implementation of `search_for_module(…)`, - also q.v.
         the calling function code sub.
         
         Caching courtesy the `functools.lru_cache(…)` decorator.
@@ -232,6 +232,9 @@ def determine_name(thing, name=None, try_repr=False):
     # up returning None:
     return search_for_name(thing)
 
+# Regexp for matching dashes in dotpaths:
+dash_re = re.compile("\-")
+
 # N.B. Items in the “replaceable_endings” tuple that
 # possibly contain other such items should appear
 # *before* the items that they contain, e.g.:
@@ -246,14 +249,16 @@ replaceable_endings  = tuple(f"{pre}{suf}" \
                                                   ending_suffixes))
 replaceable_endings += ending_suffixes
 
-def path_to_dotpath(path, relative_to=None):
+def path_to_dotpath(path, relative_to=None,
+                          convert_dashes=True):
     """ Convert a file path (e.g. “/yo/dogg/iheard/youlike.py”)
         to a dotpath (á la “yo.dogg.iheard.youlike”) in what I
         would call a “quick and dirty” fashion.
         
         Issues a BadDotpathWarning if the converted path contains
-        dashes – I don’t quite know what to do about something
-        like that besides warn, so erm. There you go.
+        dashes, and the “convert_datshes” flag is set to False
+        – I don’t quite know what to do about something like that
+        besides warn, so erm. There you go.
     """
     # Garbage in, garbage out:
     if path is None:
@@ -274,11 +279,15 @@ def path_to_dotpath(path, relative_to=None):
     while dotpath.startswith(QUALIFIER):
         dotpath = dotpath[1:]
     
-    # Warn before returning, if the converted path
-    # should contain dashes:
     if '-' in dotpath:
-        warnings.warn(f"Dotpath contains dashes: “{dotpath}”",
-                        BadDotpathWarning, stacklevel=2)
+        if convert_dashes:
+            # Substitute underscores for any dashes found:
+            dotpath = dash_re.subn('_', dotpath)[0]
+        else:
+            # Warn before returning, if the converted path
+            # should contain dashes:
+            warnings.warn(f"Dotpath contains dashes: “{dotpath}”",
+                            BadDotpathWarning, stacklevel=2)
     
     return dotpath
 
@@ -310,11 +319,12 @@ class Registry(abc.ABC, metaclass=clu.abstract.Slotted):
     def __init_subclass__(cls, appname=None, **kwargs):
         if not appname:
             appname = determine_name(cls)
-        if appname in classes:
-            raise TypeError(f"appname already registered: {appname}")
-        appnames.add(appname)
-        classes[appname] = cls
-        super(Registry, cls).__init_subclass__(**kwargs) # type: ignore
+        else:
+            if appname in classes:
+                raise TypeError(f"appname already registered: {appname}")
+            appnames.add(appname)
+            classes[appname] = cls
+        super().__init_subclass__(**kwargs) # type: ignore
         cls.instances = weakref.WeakValueDictionary()
         cls.appname = clu.abstract.ValueDescriptor(appname)
     
@@ -860,7 +870,7 @@ class ExporterBase(collections.abc.MutableMapping,
                                                      'has_appname',
                                                      'for_appname',
                                                      'unregister'),
-                           super(ExporterBase, self).__dir__()))
+                           super().__dir__()))
 
 class Exporter(ExporterBase, basepath=BASEPATH, appname=APPNAME):
     

{python_clu-0.11.5 → python_clu-0.11.6}/clu/fs/filesystem.py

@@ -614,12 +614,12 @@ class Directory(BaseFSName,
             setattr(self, 'old', old)
             setattr(self, 'new', old)
             return self
-        setattr(self, 'old', old is not None and old or self.target)
+        setattr(self, 'old', old or self.target)
         setattr(self, 'new', self.target)
         delattr(self, 'target')
         return self
     
-    def ctx_prepare(self):
+    def ctx_prepare(self, old=None):
         """ Prepares the member values of the Directory instance according
             to a requisite `self.target` directory-path value; the primary
             logic performed by this function determines whether or not it
@@ -635,7 +635,8 @@ class Directory(BaseFSName,
             cause invincibly undebuggable behavioral oddities to crop up
             in a variety of circumstances. 
         """
-        self.ctx_set_targets(old=os.getcwd())
+        if not self.prepared:
+            self.ctx_set_targets(old=old or os.getcwd())
         if os.path.isdir(self.new):
             self.will_change = differentfile(self.old, self.new)
         else:

{python_clu-0.11.5 → python_clu-0.11.6}/python_clu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.11.5
+Version: 0.11.6
 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
@@ -10,7 +10,6 @@ License: MIT
 Keywords: command utilities clu fish2000 command-line modules predicates REPL tools
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development

{python_clu-0.11.5 → python_clu-0.11.6}/setup.py

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

python_clu-0.11.5/clu/__version__.py

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