aridity 95__tar.gz → 97__tar.gz

{aridity-95 → aridity-97}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 95
+Version: 97
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
 Author-email: shrovis@foyono.com
 Description-Content-Type: text/markdown
+Requires-Dist: foyndation>=14
 Requires-Dist: pyparsing>=3.0.2
 
 # aridity
@@ -515,67 +516,3 @@ As text, the platform slash. As function, join args using that slash, starting w
 
 ### aridity.util
 
-<a id="aridity.util.openresource"></a>
-
-###### openresource
-
-```python
-def openresource(package_or_name, resource_name, encoding='ascii')
-```
-
-Like `pkg_resources.resource_stream` but text mode.
-
-<a id="aridity.util.solo"></a>
-
-###### solo
-
-```python
-def solo(v)
-```
-
-Assert exactly one object in the given sequence and return it.
-
-<a id="parabject"></a>
-
-### parabject
-
-<a id="parabject.register"></a>
-
-###### register
-
-```python
-def register(obj, paracls)
-```
-
-Instantiate paracls, set `obj` to be the regular object associated with the new parabject, and return the parabject.
-
-<a id="parabject.dereference"></a>
-
-###### dereference
-
-```python
-def dereference(parabject)
-```
-
-Get the regular object associated with `parabject` or raise UnknownParabjectException.
-
-<a id="parabject.Parabject"></a>
-
-#### Parabject Objects
-
-```python
-class Parabject()
-```
-
-Subclasses typically implement `__getattr__` for dynamic behaviour on attribute access.
-
-<a id="parabject.Parabject.__neg__"></a>
-
-###### \_\_neg\_\_
-
-```python
-def __neg__()
-```
-
-Dereference this parabject.
-

{aridity-95 → aridity-97}/README.md

@@ -505,67 +505,3 @@ As text, the platform slash. As function, join args using that slash, starting w
 
 ### aridity.util
 
-<a id="aridity.util.openresource"></a>
-
-###### openresource
-
-```python
-def openresource(package_or_name, resource_name, encoding='ascii')
-```
-
-Like `pkg_resources.resource_stream` but text mode.
-
-<a id="aridity.util.solo"></a>
-
-###### solo
-
-```python
-def solo(v)
-```
-
-Assert exactly one object in the given sequence and return it.
-
-<a id="parabject"></a>
-
-### parabject
-
-<a id="parabject.register"></a>
-
-###### register
-
-```python
-def register(obj, paracls)
-```
-
-Instantiate paracls, set `obj` to be the regular object associated with the new parabject, and return the parabject.
-
-<a id="parabject.dereference"></a>
-
-###### dereference
-
-```python
-def dereference(parabject)
-```
-
-Get the regular object associated with `parabject` or raise UnknownParabjectException.
-
-<a id="parabject.Parabject"></a>
-
-#### Parabject Objects
-
-```python
-class Parabject()
-```
-
-Subclasses typically implement `__getattr__` for dynamic behaviour on attribute access.
-
-<a id="parabject.Parabject.__neg__"></a>
-
-###### \_\_neg\_\_
-
-```python
-def __neg__()
-```
-
-Dereference this parabject.
-

{aridity-95 → aridity-97}/aridity/config.py

@@ -2,7 +2,8 @@ from .functions import OpaqueKey
 from .model import Entry, Locator, Resource, Stream, Text, wrap
 from .scope import StaticScope
 from .search import resolvedscopeornone
-from .util import dotpy, Forkable, NoSuchPathException, qualname, selectentrypoints, solo
+from .util import NoSuchPathException, selectentrypoints
+from foyndation import dotpy, Forkable, rmsuffix, solo
 from io import StringIO
 from parabject import Parabject, register
 from pathlib import Path
@@ -13,17 +14,16 @@ log = logging.getLogger(__name__)
 def _processmainfunction(mainfunction):
     module = mainfunction.__module__
     if '__main__' == module:
-        p = sys.argv[0]
-        name = os.path.basename(p)
-        if '__main__.py' == name:
-            stem = os.path.basename(os.path.dirname(p))
+        p = Path(sys.argv[0])
+        name = p.name
+        if name in {'__init__.py', '__main__.py'}:
+            stem = p.parent.name
         else:
-            assert name.endswith(dotpy)
-            stem = name[:-len(dotpy)]
+            assert (stem := rmsuffix(name, dotpy)) is not None
         assert '-' not in stem
         appname = stem.replace('_', '-')
     else:
-        attr = qualname(mainfunction)
+        attr = mainfunction.__qualname__
         # FIXME: Requires metadata e.g. egg-info in projects that have not been installed:
         appname, = (ep.name for ep in selectentrypoints('console_scripts') if ep.module == module and ep.attr == attr)
     return module, appname
@@ -183,3 +183,8 @@ class WConfig(Parabject):
         query = (-self).addname(OpaqueKey())
         query.basescope[tuple(query.prefix)] = wrap(value)
         return self
+
+    def __neg__(self):
+        query = super().__neg__()
+        query.basescope.getorcreatesubscope(query.prefix) # TODO: Too eager.
+        return query

{aridity-95 → aridity-97}/aridity/functions.py

@@ -1,6 +1,7 @@
 from .keyring import gpg, keyring
 from .model import Boolean, Hole, Indeterminate, Number, Resource, Text, wrap
-from .util import dotpy, NoSuchPathException
+from .util import NoSuchPathException
+from foyndation import dotpy
 from importlib import import_module
 from itertools import chain
 import json, re, shlex

{aridity-95 → aridity-97}/aridity/model.py

@@ -1,5 +1,6 @@
-from .util import Burial, dotpy, Forkable
+from .util import Burial
 from contextlib import contextmanager
+from foyndation import dotpy, Forkable, rmsuffix
 from importlib import import_module
 from importlib.resources import files
 from io import TextIOWrapper
@@ -266,7 +267,7 @@ class Resource(Resolved, Openable, Forkable):
 
     def _packagename(self):
         m = import_module(self.package_or_requirement)
-        package = m.__package__
+        package = m.__spec__.parent
         return (self.package_or_requirement if hasattr(m, '__path__') else self.package_or_requirement[:self.package_or_requirement.rindex('.')]) if package is None else package
 
     def _resource_words(self):
@@ -287,8 +288,8 @@ class Resource(Resolved, Openable, Forkable):
         return self._of(self.package_or_requirement, '/'.join(v) if v else None, self.encoding)
 
     def modulenameornone(self):
-        if self.resource_name.endswith(dotpy):
-            return f"{self._packagename()}.{self.resource_name[:-len(dotpy)].replace('/', '.')}"
+        if (stem := rmsuffix(self.resource_name, dotpy)) is not None:
+            return f"{self._packagename()}.{stem.replace('/', '.')}"
 
 class Binary(BaseScalar, Forkable):
 

{aridity-95 → aridity-97}/aridity/resolve.py

@@ -1,44 +1,39 @@
 from .search import Query
-from .util import CycleException, Forkable, NoSuchPathException, TreeNoSuchPathException
+from .util import CycleException, NoSuchPathException, TreeNoSuchPathException
+from foyndation import Forkable
 
 class BaseResolveContext:
 
     @property
     def label(self):
-        return self.leafscope().label
+        return self.resolved().label
 
     @property
     def parents(self):
-        return self.leafscope().parents
+        return self.resolved().parents
 
     @property
     def resolvables(self):
-        return self.leafscope().resolvables
+        return self.resolved().resolvables
 
     def createchild(self):
-        return self.leafscope().createchild()
+        return self.resolved().createchild()
 
     def getresolvecontext(self):
         return self
 
     def resolvableornone(self, key):
-        return self.leafscope().resolvableornone(key)
-
-    def resolved(self, *path):
-        return self.resolvedimpl(path) if path else self.leafscope()
+        return self.resolved().resolvableornone(key)
 
     def staticscope(self):
-        return self.leafscope().staticscope()
+        return self.resolved().staticscope()
 
 class AnchorResolveContext(BaseResolveContext):
 
     def __init__(self, anchorscope):
         self.anchorscope = anchorscope
 
-    def leafscope(self):
-        return self.anchorscope
-
-    def resolvedimpl(self, path):
+    def resolved(self, *path):
         hit = Query([], path).search(self.anchorscope)
         return hit.resolvable.resolve(ResolveContext(self.anchorscope, path, [hit.address]))
 
@@ -50,10 +45,7 @@ class ResolveContext(BaseResolveContext, Forkable):
         self.exprpath = exprpath
         self.addresses = addresses
 
-    def leafscope(self):
-        return Query([], self.scopepath).search(self.anchorscope).naiveresolve() if self.scopepath else self.anchorscope # XXX: Is naiveresolve correct here?
-
-    def resolvedimpl(self, path):
+    def resolved(self, *path):
         try:
             hit = Query(self.scopepath, path).search(self.anchorscope)
             if hit.address in self.addresses: # XXX: Could it be valid to resolve the same address recursively with 2 different contexts?

{aridity-95 → aridity-97}/aridity/scope.py

@@ -4,7 +4,8 @@ from .model import Directive, Function, Hole, Resolvable, Scalar, star, Stream,
 from .resolve import AnchorResolveContext
 from .search import Query
 from .stacks import IndentStack, SimpleStack, ThreadLocalResolvable
-from .util import NoSuchPathException, solo, UnsupportedEntryException
+from .util import NoSuchPathException, UnsupportedEntryException
+from foyndation import solo
 from itertools import chain
 import os, sys, threading
 

{aridity-95 → aridity-97}/aridity/search.py

@@ -111,4 +111,4 @@ class Query:
                     return hit
                 if besthit is None or _lt(hit.depths, besthit.depths):
                     besthit = hit
-        raise UnparseNoSuchPathException(self.path)
+        raise UnparseNoSuchPathException(scope, self.path[:self.prefixlen], self.path[self.prefixlen:])

{aridity-95 → aridity-97}/aridity/util.py

@@ -1,8 +1,6 @@
 from contextlib import contextmanager
 from importlib.metadata import entry_points
-import sys
 
-dotpy = '.py'
 inf = float('inf')
 null_exc_info = None, None, None
 
@@ -10,9 +8,12 @@ class NoSuchPathException(Exception): pass
 
 class UnparseNoSuchPathException(NoSuchPathException):
 
+    @property
+    def path(self):
+        return self.args[-1]
+
     def __str__(self):
-        path, = self.args
-        return ' '.join(path)
+        return ' '.join(self.path)
 
 class TreeNoSuchPathException(NoSuchPathException):
 
@@ -36,25 +37,6 @@ class CycleException(UnparseNoSuchPathException): pass
 
 class UnsupportedEntryException(Exception): pass
 
-def openresource(package_or_name, resource_name, encoding = 'ascii'):
-    'Like `pkg_resources.resource_stream` but text mode.'
-    from .model import Resource
-    return Resource(package_or_name, resource_name, encoding).open(False)
-
-def solo(v):
-    'Assert exactly one object in the given sequence and return it.'
-    x, = v
-    return x
-
-def qualname(obj):
-    try:
-        return obj.__qualname__
-    except AttributeError:
-        name = obj.__name__
-        if getattr(sys.modules[obj.__module__], name) is not obj:
-            raise
-        return name
-
 def selectentrypoints(group):
     obj = entry_points()
     try:
@@ -68,12 +50,6 @@ def popattr(obj, name):
     delattr(obj, name)
     return val
 
-class Forkable:
-
-    @classmethod
-    def _of(cls, *args, **kwargs):
-        return cls(*args, **kwargs)
-
 class Burial:
 
     name = 'burial'

{aridity-95 → aridity-97}/aridity.egg-info/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 95
+Version: 97
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
 Author-email: shrovis@foyono.com
 Description-Content-Type: text/markdown
+Requires-Dist: foyndation>=14
 Requires-Dist: pyparsing>=3.0.2
 
 # aridity
@@ -515,67 +516,3 @@ As text, the platform slash. As function, join args using that slash, starting w
 
 ### aridity.util
 
-<a id="aridity.util.openresource"></a>
-
-###### openresource
-
-```python
-def openresource(package_or_name, resource_name, encoding='ascii')
-```
-
-Like `pkg_resources.resource_stream` but text mode.
-
-<a id="aridity.util.solo"></a>
-
-###### solo
-
-```python
-def solo(v)
-```
-
-Assert exactly one object in the given sequence and return it.
-
-<a id="parabject"></a>
-
-### parabject
-
-<a id="parabject.register"></a>
-
-###### register
-
-```python
-def register(obj, paracls)
-```
-
-Instantiate paracls, set `obj` to be the regular object associated with the new parabject, and return the parabject.
-
-<a id="parabject.dereference"></a>
-
-###### dereference
-
-```python
-def dereference(parabject)
-```
-
-Get the regular object associated with `parabject` or raise UnknownParabjectException.
-
-<a id="parabject.Parabject"></a>
-
-#### Parabject Objects
-
-```python
-class Parabject()
-```
-
-Subclasses typically implement `__getattr__` for dynamic behaviour on attribute access.
-
-<a id="parabject.Parabject.__neg__"></a>
-
-###### \_\_neg\_\_
-
-```python
-def __neg__()
-```
-
-Dereference this parabject.
-

{aridity-95 → aridity-97}/aridity.egg-info/SOURCES.txt

@@ -1,5 +1,4 @@
 README.md
-parabject.py
 setup.py
 aridity/__init__.py
 aridity/arid_config.py

{aridity-95 → aridity-97}/aridity.egg-info/requires.txt

@@ -1 +1,2 @@
+foyndation>=14
 pyparsing>=3.0.2

aridity-97/aridity.egg-info/top_level.txt

@@ -0,0 +1 @@
+aridity

{aridity-95 → aridity-97}/setup.py

@@ -49,13 +49,13 @@ class SourceInfo:
 sourceinfo = SourceInfo('.')
 setup(
     name = 'aridity',
-    version = '95',
+    version = '97',
     description = 'DRY config and template system, easily extensible with Python',
     url = 'https://pypi.org/project/aridity/',
     author = 'foyono',
     author_email = 'shrovis@foyono.com',
-    py_modules = ['parabject'],
-    install_requires = ['pyparsing>=3.0.2'],
+    py_modules = [],
+    install_requires = ['foyndation>=14', 'pyparsing>=3.0.2'],
     package_data = {'': ['*.pxd', '*.pyx', '*.pyxbld', '*.arid', '*.aridt']},
     entry_points = {'console_scripts': ['aridity=aridity.__init__:main', 'arid-config=aridity.arid_config:main', 'processtemplate=aridity.processtemplate:main']},
     **sourceinfo.setup_kwargs(),

aridity-95/aridity.egg-info/top_level.txt

@@ -1,2 +0,0 @@
-aridity
-parabject

aridity-95/parabject.py

@@ -1,25 +0,0 @@
-from weakref import WeakKeyDictionary
-
-lookup = WeakKeyDictionary()
-
-def register(obj, paracls):
-    'Instantiate paracls, set `obj` to be the regular object associated with the new parabject, and return the parabject.'
-    parabject = paracls()
-    lookup[parabject] = obj
-    return parabject
-
-class UnknownParabjectException(Exception): pass
-
-def dereference(parabject):
-    'Get the regular object associated with `parabject` or raise UnknownParabjectException.'
-    try:
-        return lookup[parabject]
-    except (KeyError, TypeError):
-        raise UnknownParabjectException
-
-class Parabject:
-    'Subclasses typically implement `__getattr__` for dynamic behaviour on attribute access.'
-
-    def __neg__(self):
-        'Dereference this parabject.'
-        return dereference(self)