aridity 87__tar.gz → 89__tar.gz

{aridity-87 → aridity-89}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 87
+Version: 89
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono

{aridity-87 → aridity-89}/aridity/config.py

@@ -34,7 +34,8 @@ def _wrappathorstream(pathorstream):
 class ConfigCtrl:
     'High level scope API.'
 
-    settingsopenable = Locator(Path.home() / '.settings.arid')
+    if 'HOME' in os.environ:
+        settingsopenable = Locator(Path.home() / '.settings.arid')
 
     @classmethod
     def _of(cls, *args, **kwargs):

{aridity-87 → aridity-89}/aridity/functions.py

@@ -108,6 +108,12 @@ def map_(scope, objsresolvable, *args):
         result.resolvables.put(k, resolvable.resolve(context(k, v)))
     return result
 
+def map1(scope, contextresolvable, resultresolvable):
+    from .scope import ScalarScope, Scope
+    context = contextresolvable.resolve(scope)
+    # FIXME: In scalar context case we need to propagate its resolve context.
+    return resultresolvable.resolve(Scope([context, scope]) if hasattr(context, 'resolvables') else ScalarScope([scope], context))
+
 def _flat(scope, listsresolvable):
     from .scope import Scope
     s = Scope(islist = True) # XXX: Really no parent?
@@ -211,9 +217,6 @@ def pyres(scope, packageresolvable, nameresolvable, encoding = Text('ascii')):
 def _not(scope, resolvable):
     return Boolean(not resolvable.resolve(scope).truth())
 
-def _getfrom(scope, scoperesolvable, *resolvables):
-    return scoperesolvable.resolve(scope).resolved(*(r.resolve(scope).textvalue for r in resolvables))
-
 def _indentmorelines(scope, resolvable):
     indent = scope.resolved('indent').textvalue
     lines = resolvable.resolve(scope).textvalue.splitlines(True)
@@ -265,6 +268,7 @@ def corefunctions():
     yield 'tomlquote', tomlquote
     yield 'urlquote', urlquote
     yield 'map', map_
+    yield 'map1', map1
     yield 'flat', _flat
     yield 'label', _label
     yield 'join', join
@@ -283,7 +287,6 @@ def corefunctions():
     yield 'pyref', pyref
     yield 'pyres', pyres
     yield '\N{NOT SIGN}', _not
-    yield 'getfrom', _getfrom
     yield 'indentmorelines', _indentmorelines
     yield 'hole', _hole
     yield '', getimpl # TODO: Refer to the other one.

{aridity-87 → aridity-89}/aridity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 87
+Version: 89
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono

{aridity-87 → aridity-89}/setup.py

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