aridity 76__tar.gz → 78__tar.gz

{aridity-76 → aridity-78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 76
+Version: 78
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
@@ -604,7 +604,7 @@ Python object in given module with given qualified name. Module may be relative
 ###### pyres
 
 ```python
-def pyres(scope, packageresolvable, nameresolvable)
+def pyres(scope, packageresolvable, nameresolvable, encoding=Text('ascii'))
 ```
 
 Python resource for inclusion with `.` directive.

{aridity-76 → aridity-78}/README.md

@@ -592,7 +592,7 @@ Python object in given module with given qualified name. Module may be relative
 ###### pyres
 
 ```python
-def pyres(scope, packageresolvable, nameresolvable)
+def pyres(scope, packageresolvable, nameresolvable, encoding=Text('ascii'))
 ```
 
 Python resource for inclusion with `.` directive.

{aridity-76 → aridity-78}/aridity/config.py

@@ -108,7 +108,7 @@ class ConfigCtrl:
     def execute(self, text):
         'Execute given config text.'
         with self.repl() as repl:
-            for line in text.splitlines():
+            for line in text.splitlines(True):
                 repl(line)
 
     def put(self, *path, **kwargs):

{aridity-76 → aridity-78}/aridity/functions.py

@@ -1,5 +1,5 @@
 from __future__ import division
-from .model import Boolean, Number, Resource, Text, wrap
+from .model import Boolean, Hole, Number, Resource, Text, wrap
 from .util import allfunctions, dotpy, NoSuchPathException, realname
 from importlib import import_module
 from itertools import chain
@@ -221,9 +221,9 @@ class Functions:
             pyobj = getattr(pyobj, name)
         return wrap(pyobj)
 
-    def pyres(scope, packageresolvable, nameresolvable):
+    def pyres(scope, packageresolvable, nameresolvable, encoding = Text('ascii')):
         'Python resource for inclusion with `.` directive.'
-        return Resource(packageresolvable.resolve(scope).cat(), nameresolvable.resolve(scope).cat())
+        return Resource(packageresolvable.resolve(scope).cat(), nameresolvable.resolve(scope).cat(), encoding.resolve(scope).cat())
 
     @realname('\N{NOT SIGN}')
     def not_(scope, resolvable):
@@ -247,6 +247,9 @@ class Functions:
         lines = resolvable.resolve(scope).cat().splitlines(True)
         return Text(''.join(chain(lines[:1], (indent + line for line in lines[1:]))))
 
+    def hole(scope, resolvable):
+        return Hole('', resolvable.resolve(scope).cat())
+
 def getimpl(scope, *resolvables, **kwargs):
     return scope.resolved(*(r.resolve(scope).cat() for r in resolvables), **kwargs)
 

{aridity-76 → aridity-78}/aridity/model.py

@@ -60,12 +60,27 @@ class Concat(Resolvable):
     def resolve(self, scope, aslist = False):
         if aslist:
             return List([part.resolve(scope) for part in self.parts if not part.ignorable])
-        def g():
-            for part in self.parts:
-                text = part.resolve(scope).cat()
-                yield text
-                self.monitor(text)
-        return Text(''.join(g()))
+        buffer = []
+        negbuffer = ''
+        for part in self.parts:
+            obj = part.resolve(scope)
+            try:
+                negtext = obj.holevalue
+            except AttributeError:
+                text = obj.cat()
+                negtext = ''
+            else:
+                text = obj.prefix
+            k = min(len(negbuffer), len(text))
+            if k:
+                assert negbuffer[:k] == text[:k]
+                negbuffer = negbuffer[k:]
+                text = text[k:]
+            buffer.append(text)
+            self.monitor(text)
+            negbuffer += negtext
+        buffer = ''.join(buffer)
+        return Hole(buffer, negbuffer) if negbuffer else Text(buffer)
 
     def unparse(self):
         return ''.join(part.unparse() for part in self.parts)
@@ -158,6 +173,16 @@ class Text(Cat, BaseScalar):
             return o
         return Locator(s)
 
+class Hole(BaseScalar):
+
+    @property
+    def scalar(self):
+        raise CatNotSupportedException
+
+    def __init__(self, prefix, holevalue):
+        self.prefix = prefix
+        self.holevalue = holevalue
+
 class Openable:
 
     def openable(self, scope):

{aridity-76 → aridity-78}/aridity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 76
+Version: 78
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
@@ -604,7 +604,7 @@ Python object in given module with given qualified name. Module may be relative
 ###### pyres
 
 ```python
-def pyres(scope, packageresolvable, nameresolvable)
+def pyres(scope, packageresolvable, nameresolvable, encoding=Text('ascii'))
 ```
 
 Python resource for inclusion with `.` directive.

{aridity-76 → aridity-78}/setup.py

@@ -6,7 +6,7 @@ def long_description():
 
 setup(
     name = 'aridity',
-    version = '76',
+    version = '78',
     description = 'DRY config and template system, easily extensible with Python',
     long_description = long_description(),
     long_description_content_type = 'text/markdown',