aridity 73__tar.gz → 74__tar.gz

{aridity-73 → aridity-74}/PKG-INFO

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

{aridity-73 → aridity-74}/aridity/functions.py

@@ -236,6 +236,16 @@ class Functions:
     def getfrom(scope, scoperesolvable, *resolvables):
         return scoperesolvable.resolve(scope).resolved(*(r.resolve(scope).cat() for r in resolvables))
 
+    def rmeol(scope, resolvable):
+        text = resolvable.resolve(scope).cat()
+        if text.endswith('\r\n'):
+            n = 2
+        elif text.endswith(('\r', '\n')):
+            n = 1
+        else:
+            raise NoSuchPathException('No line terminator to remove.')
+        return Text(text[:-n])
+
 def getimpl(scope, *resolvables):
     return scope.resolved(*(r.resolve(scope).cat() for r in resolvables))
 

{aridity-73 → aridity-74}/aridity/scope.py

@@ -2,7 +2,7 @@ from . import directives
 from .directives import Precedence
 from .functions import getfunctions, OpaqueKey
 from .model import CatNotSupportedException, Directive, Function, Resolvable, Scalar, star, Stream, Text
-from .search import Query, resolvedscopeornone, scopedepths, slices
+from .search import Query, resolvedscopeornone, slices
 from .stacks import IndentStack, SimpleStack, ThreadLocalResolvable
 from .util import CycleException, NoSuchPathException, OrderedDict, solo, TreeNoSuchPathException, UnsupportedEntryException
 from itertools import chain
@@ -134,7 +134,7 @@ class AbstractScope(Resolvable): # TODO LATER: Some methods should probably be m
             # TODO: Review this algo.
             errors = []
             for words in slices(path):
-                for s in (resolvedscopeornone(s, words) for s in chain.from_iterable(scopedepths(self))):
+                for s in (resolvedscopeornone(s, words) for s in chain.from_iterable(self.scopedepths())):
                     if s is not None:
                         try:
                             return hit.resolvable.resolve(s, **kwargs)
@@ -147,12 +147,21 @@ class AbstractScope(Resolvable): # TODO LATER: Some methods should probably be m
     def resolvableornone(self, key):
         return self.resolvables.getornone(key)
 
+    def scopedepths(self):
+        scopes = [self]
+        while scopes:
+            nextscopes = []
+            for s in scopes:
+                nextscopes.extend(s.parents)
+            yield scopes
+            scopes = nextscopes
+
     def unravel(self):
         d = OrderedDict([k, o.unravel()] for k, o in self.resolveditems())
         return list(d) if self.islist or (d and all(OpaqueKey.isopaque(k) for k in d.keys())) else d
 
     def staticscope(self):
-        for s in chain.from_iterable(scopedepths(self)):
+        for s in chain.from_iterable(self.scopedepths()):
             pass
         return s
 

{aridity-73 → aridity-74}/aridity/search.py

@@ -3,15 +3,6 @@ from collections import namedtuple
 from itertools import islice
 import heapq
 
-def scopedepths(scope):
-    scopes = [scope]
-    while scopes:
-        nextscopes = []
-        for s in scopes:
-            nextscopes.extend(s.parents)
-        yield scopes
-        scopes = nextscopes
-
 def resolvedscopeornone(s, path):
     for name in path:
         r = s.resolvableornone(name)
@@ -22,15 +13,15 @@ def resolvedscopeornone(s, path):
             return
     return s
 
-class Hit(namedtuple('BaseHit', 'revdepths scope resolvable')):
+class Hit(namedtuple('BaseHit', 'depths scope resolvable')):
 
     def iterornone(self, word):
         contextscope = self.resolvable.resolve(self.scope) # XXX: Wise?
         if hasattr(contextscope, 'resolvableornone'):
-            return Iterator(self.revdepths, contextscope, word)
+            return Iterator(self.depths, contextscope, word)
 
     def shortcut(self, zerocount):
-        return all(not d for d in islice(self.revdepths, None, zerocount))
+        return all(not d for d in islice(self.depths, len(self.depths) - zerocount, None))
 
 class Iterable:
 
@@ -39,13 +30,13 @@ class Iterable:
 
 class Iterator(Iterable):
 
-    def __init__(self, revdepths, contextscope, word):
+    def __init__(self, depths, contextscope, word):
         def g():
-            for depth, scopes in enumerate(scopedepths(contextscope)):
+            for depth, scopes in enumerate(contextscope.scopedepths()):
                 for scope in scopes:
                     resolvable = scope.resolvableornone(word)
                     if resolvable is not None:
-                        yield Hit([depth] + revdepths, scope, resolvable)
+                        yield Hit(depths + [depth], scope, resolvable)
         self.iterator = g()
 
     def next(self):
@@ -65,6 +56,13 @@ class Merge(Iterable):
     def popiterator(self):
         return heapq.merge(*popattr(self, 'iterables'))
 
+def _lt(*depthspair):
+    for d1, d2 in zip(*map(reversed, depthspair)):
+        if d1 < d2:
+            return True
+        if d1 > d2:
+            break
+
 class Sump:
 
     besthit = None
@@ -73,7 +71,7 @@ class Sump:
         pass
 
     def offer(self, hit):
-        if self.besthit is None or hit.revdepths < self.besthit.revdepths:
+        if self.besthit is None or _lt(hit.depths, self.besthit.depths):
             self.besthit = hit
 
     def __iter__(self):

{aridity-73 → aridity-74}/aridity.egg-info/PKG-INFO

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

{aridity-73 → aridity-74}/setup.py

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