aridity 94__tar.gz → 95__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 94
+Version: 95
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
@@ -158,6 +158,17 @@ def source(prefix, suffix, scope)
 
 Include path or resource at prefix.
 
+<a id="aridity.directives.sourceifexists"></a>
+
+###### sourceifexists
+
+```python
+@prime
+def sourceifexists(prefix, suffix, scope)
+```
+
+Like `.` but allow the resource to be absent.
+
 <a id="aridity.directives.equals"></a>
 
 ###### equals

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

@@ -148,6 +148,17 @@ def source(prefix, suffix, scope)
 
 Include path or resource at prefix.
 
+<a id="aridity.directives.sourceifexists"></a>
+
+###### sourceifexists
+
+```python
+@prime
+def sourceifexists(prefix, suffix, scope)
+```
+
+Like `.` but allow the resource to be absent.
+
 <a id="aridity.directives.equals"></a>
 
 ###### equals

{aridity-94 → aridity-95}/aridity/directives.py

@@ -1,7 +1,10 @@
 from .model import Stream
 from .search import resolvedscopeornone
+from .util import Burial
 from itertools import chain
-import os, sys, unicodedata
+import logging, os, sys, unicodedata
+
+log = logging.getLogger(__name__)
 
 def acceptdirectivename(word):
     return word and unicodedata.category(word[0])[0] in 'PS'
@@ -48,7 +51,19 @@ def source(prefix, suffix, scope):
         if s is None:
             break
         phrasescope = s
-    suffix.tophrase().resolve(phrasescope).openable(phrasescope).source(scope, prefix.subentry(k, n))
+    with Burial.bumping(FileNotFoundError):
+        openable = suffix.tophrase().resolve(phrasescope).openable(phrasescope)
+    openable.source(scope, prefix.subentry(k, n))
+
+@prime
+def sourceifexists(prefix, suffix, scope):
+    'Like `.` but allow the resource to be absent.'
+    try:
+        source(prefix, suffix, scope)
+    except FileNotFoundError as e:
+        if Burial.value(e):
+            raise
+        log.debug("Ignore absence: %s", e)
 
 @prime
 def _cd(prefix, suffix, scope):
@@ -95,6 +110,7 @@ def coredirectives():
     yield '!redirect', _redirect
     yield '!write', _write
     yield '.', source
+    yield '.?', sourceifexists
     yield '!cd', _cd
     yield '!test', _test
     yield '=', equals

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

@@ -1,4 +1,4 @@
-from .util import dotpy, Forkable
+from .util import Burial, dotpy, Forkable
 from contextlib import contextmanager
 from importlib import import_module
 from importlib.resources import files
@@ -232,7 +232,7 @@ class Openable:
             yield f
 
     def source(self, scope, prefix):
-        with self.pushopen(scope) as f:
+        with self.pushopen(scope) as f, Burial.bumping(FileNotFoundError):
             Stream(f).source(scope, prefix)
 
     def processtemplate(self, scope):

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

@@ -1,3 +1,4 @@
+from contextlib import contextmanager
 from importlib.metadata import entry_points
 import sys
 
@@ -72,3 +73,20 @@ class Forkable:
     @classmethod
     def _of(cls, *args, **kwargs):
         return cls(*args, **kwargs)
+
+class Burial:
+
+    name = 'burial'
+
+    @classmethod
+    def value(cls, e):
+        return getattr(e, cls.name, 0)
+
+    @classmethod
+    @contextmanager
+    def bumping(cls, exctype):
+        try:
+            yield
+        except exctype as e:
+            setattr(e, cls.name, cls.value(e) + 1)
+            raise

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 94
+Version: 95
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
@@ -158,6 +158,17 @@ def source(prefix, suffix, scope)
 
 Include path or resource at prefix.
 
+<a id="aridity.directives.sourceifexists"></a>
+
+###### sourceifexists
+
+```python
+@prime
+def sourceifexists(prefix, suffix, scope)
+```
+
+Like `.` but allow the resource to be absent.
+
 <a id="aridity.directives.equals"></a>
 
 ###### equals

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

@@ -49,7 +49,7 @@ class SourceInfo:
 sourceinfo = SourceInfo('.')
 setup(
     name = 'aridity',
-    version = '94',
+    version = '95',
     description = 'DRY config and template system, easily extensible with Python',
     url = 'https://pypi.org/project/aridity/',
     author = 'foyono',