aridity 79__tar.gz → 81__tar.gz

{aridity-79 → aridity-81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 79
+Version: 81
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
@@ -23,7 +23,7 @@ def main():
     config = ConfigCtrl().loadappconfig(main, 'dbtool.arid')
     print(config.dbhost)
 ```
-Sibling dbtool.arid of main module, self-documenting that `dbhost` should be configured:
+Base config file `dbtool.arid` as sibling of main module, self-documenting that `dbhost` should be configured:
 ```
 dbhost = $(void)
 ```

{aridity-79 → aridity-81}/README.md

@@ -11,7 +11,7 @@ def main():
     config = ConfigCtrl().loadappconfig(main, 'dbtool.arid')
     print(config.dbhost)
 ```
-Sibling dbtool.arid of main module, self-documenting that `dbhost` should be configured:
+Base config file `dbtool.arid` as sibling of main module, self-documenting that `dbhost` should be configured:
 ```
 dbhost = $(void)
 ```

{aridity-79 → aridity-81}/aridity/config.py

@@ -146,12 +146,11 @@ class ConfigCtrl:
     def processtemplate(self, frompathorstream, topathorstream):
         'Evaluate expression from path/stream and write result to path/stream.'
         s = self.scope()
-        text = _wrappathorstream(frompathorstream).processtemplate(s)
+        obj = _wrappathorstream(frompathorstream).processtemplate(s)
         if getattr(topathorstream, 'writable', lambda: False)():
-            topathorstream.write(text)
+            topathorstream.write(obj.cat())
         else:
-            with open(topathorstream, 'w') as g:
-                g.write(text)
+            obj.writeout(topathorstream)
 
     def freectrl(self):
         return self._of(self.scope()) # XXX: Strict?

{aridity-79 → aridity-81}/aridity/directives.py

@@ -94,4 +94,4 @@ class Cat:
     name = '<'
     def __call__(self, prefix, suffix, scope):
         scope = scope.getorcreatesubscope(prefix.topath(scope))
-        scope.resolved('stdout').flush(suffix.tophrase().resolve(scope).openable(scope).processtemplate(scope))
+        scope.resolved('stdout').flush(suffix.tophrase().resolve(scope).openable(scope).processtemplate(scope).cat())

{aridity-79 → aridity-81}/aridity/functions.py

@@ -1,4 +1,3 @@
-from __future__ import division
 from .model import Boolean, Hole, Number, Resource, Text, wrap
 from .util import allfunctions, dotpy, NoSuchPathException, realname
 from importlib import import_module
@@ -192,7 +191,7 @@ class Functions:
 
     def processtemplate(scope, resolvable):
         'Evaluate the content of the given path as an expression.'
-        return Text(resolvable.resolve(scope).openable(scope).processtemplate(scope))
+        return resolvable.resolve(scope).openable(scope).processtemplate(scope)
 
     def lower(scope, resolvable):
         return Text(resolvable.resolve(scope).cat().lower())
@@ -248,7 +247,7 @@ class Functions:
         return Text(''.join(chain(lines[:1], (indent + line for line in lines[1:]))))
 
     def hole(scope, resolvable):
-        return Hole('', resolvable.resolve(scope).cat())
+        return Hole(Text(''), resolvable.resolve(scope).cat())
 
 def getimpl(scope, *resolvables, **kwargs):
     return scope.resolved(*(r.resolve(scope).cat() for r in resolvables), **kwargs)

{aridity-79 → aridity-81}/aridity/model.py

@@ -1,8 +1,7 @@
-from __future__ import division
-from .util import dotpy, ispy2
+from .util import dotpy
 from contextlib import contextmanager
 from importlib import import_module
-from io import BytesIO, TextIOWrapper
+from io import TextIOWrapper
 from itertools import chain, islice
 from parabject import dereference, UnknownParabjectException
 import importlib_resources, numbers, os
@@ -70,7 +69,7 @@ class Concat(Resolvable):
                 text = obj.cat()
                 negtext = ''
             else:
-                text = obj.prefix
+                text = obj.prefix.textvalue
             k = min(len(negbuffer), len(text))
             if k:
                 assert negbuffer[:k] == text[:k]
@@ -78,9 +77,9 @@ class Concat(Resolvable):
                 text = text[k:]
             buffer.append(text)
             self.monitor(text)
-            negbuffer += negtext
-        buffer = ''.join(buffer)
-        return Hole(buffer, negbuffer) if negbuffer else Text(buffer)
+            negbuffer = negtext + negbuffer
+        buffer = Text(''.join(buffer))
+        return Hole(buffer, negbuffer) if negbuffer else buffer
 
     def unparse(self):
         return ''.join(part.unparse() for part in self.parts)
@@ -249,11 +248,8 @@ class Resource(Resolved, Openable):
         path = importlib_resources.files(package)
         for name in self._resource_words():
             path /= name
-        with path.open('rb') as f:
-            if ispy2:
-                f = BytesIO(f.read())
-            with TextIOWrapper(f, self.encoding) as f:
-                yield f
+        with path.open('rb') as f, TextIOWrapper(f, self.encoding) as g:
+            yield g
 
     def slash(self, words, rstrip):
         v = list(chain(self._resource_words()[:-1 if rstrip else None], words))
@@ -395,7 +391,7 @@ class Stream(Resolved):
     def processtemplate(self, scope):
         from .grammar import templateparser
         with scope.staticscope().indent.push() as monitor:
-            return templateparser(monitor)(self.streamvalue.read()).resolve(scope).cat()
+            return templateparser(monitor)(self.streamvalue.read()).resolve(scope)
 
 class Entry(Struct):
 

{aridity-79 → aridity-81}/aridity/scope.py

@@ -1,7 +1,7 @@
 from . import directives
 from .directives import Precedence
 from .functions import getfunctions, getimpl, OpaqueKey
-from .model import CatNotSupportedException, Directive, Function, Resolvable, Scalar, star, Stream, Text
+from .model import CatNotSupportedException, Directive, Function, Hole, Resolvable, Scalar, star, Stream, Text
 from .resolve import AnchorResolveContext
 from .search import Query
 from .stacks import IndentStack, SimpleStack, ThreadLocalResolvable
@@ -230,6 +230,7 @@ class StaticScope(AbstractScope):
         self['/',] = Slash()
         self['*',] = Star()
         self['None',] = Scalar(None)
+        self['eolhole',] = Hole(Text(''), '\n')
         for name in self.stacktypes:
             self[name,] = ThreadLocalResolvable(self.threadlocals, name)
 

{aridity-79 → aridity-81}/aridity/util.py

@@ -2,7 +2,6 @@ from importlib_metadata import entry_points
 import collections, inspect, sys
 
 dotpy = '.py'
-ispy2 = sys.version_info.major < 3
 null_exc_info = None, None, None
 
 class NoSuchPathException(Exception): pass

{aridity-79 → aridity-81}/aridity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 79
+Version: 81
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
@@ -23,7 +23,7 @@ def main():
     config = ConfigCtrl().loadappconfig(main, 'dbtool.arid')
     print(config.dbhost)
 ```
-Sibling dbtool.arid of main module, self-documenting that `dbhost` should be configured:
+Base config file `dbtool.arid` as sibling of main module, self-documenting that `dbhost` should be configured:
 ```
 dbhost = $(void)
 ```

{aridity-79 → aridity-81}/aridity.egg-info/SOURCES.txt

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

{aridity-79 → aridity-81}/setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 0
-
 [egg_info]
 tag_build = 
 tag_date = 0

{aridity-79 → aridity-81}/setup.py

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