pypage 2.1.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

{pypage-2.1.0.dist-info → pypage-2.2.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pypage
-Version: 2.1.0
-Summary: Light-weight Python Templating Engine
+Version: 2.2.0
+Summary:  Light-weight Python Templating Engine
 Home-page: https://github.com/arjun-menon/pypage
-Download-URL: https://github.com/arjun-menon/pypage/archive/v2.1.0.tar.gz
+Download-URL: https://github.com/arjun-menon/pypage/archive/v2.2.0.tar.gz
 Author: Arjun G. Menon
 Author-email: contact@arjungmenon.com
 License: Apache-2.0
@@ -24,6 +24,16 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 3
 License-File: LICENSE.txt
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
 
 PyPage |pypi| |docs| |test|
 ===========================

pypage-2.2.0.dist-info/RECORD

@@ -0,0 +1,7 @@
+pypage.py,sha256=s6OuUUo_nZjpS9aZFaXMBXlUvBUDSiF_3DzIoaE2uW4,30890
+pypage-2.2.0.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pypage-2.2.0.dist-info/METADATA,sha256=GDhXXdpQcCAnSziU-5_Z9P1QujNlnSFUAY9sXggefWU,18347
+pypage-2.2.0.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+pypage-2.2.0.dist-info/entry_points.txt,sha256=iHPN6EfIUdv-njh8GV04yDTzkcCLGNcXvdbA43s_8mo,39
+pypage-2.2.0.dist-info/top_level.txt,sha256=8AAB15dVQEt9xcwH_eLcVUZEbFlc__81RA5mOrYtJiQ,7
+pypage-2.2.0.dist-info/RECORD,,

{pypage-2.1.0.dist-info → pypage-2.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (78.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pypage.py

@@ -18,7 +18,7 @@
 from __future__ import print_function
 import string, sys, time, os, json
 
-pypage_version = '2.1.0'
+pypage_version = '2.2.0'
 
 class RootNode(object):
     """
@@ -303,6 +303,51 @@ class WhileBlock(BlockTag):
 
         return output
 
+class DefBlock(BlockTag):
+    """
+    The function tag. {% def foo a b c %}
+    """
+    tag_startswith = 'def '
+
+    @staticmethod
+    def identify(src):
+        return src.strip().startswith(DefBlock.tag_startswith)
+
+    def __init__(self, node):
+        super(DefBlock, self).__init__(node.loc)
+        self.src = node.src.strip()
+
+        name_and_args = self.src[len(self.tag_startswith):].strip().split()
+        for name  in name_and_args:
+            if not isidentifier(name):
+                raise InvalidDefBlockFunctionOrArgName(name)
+
+        self.funcname = name_and_args[0]
+        self.argnames = name_and_args[1:]
+
+    def run(self, pe):
+        def invoke(args):
+            if len(args) != len(self.argnames):
+                raise InvalidDefBlockMismatchingArgCount(self.argnames, args)
+
+            conflicting = set(pe.env.keys()) & set(self.argnames)
+            backup = { x : pe.env[x] for x in conflicting }
+
+            local_vars = dict(zip(self.argnames, args))
+            pe.env.update(local_vars)
+
+            output = exec_tree(self, pe)
+
+            for argname in self.argnames:
+                if argname in pe.env:
+                    del pe.env[argname]
+
+            pe.env.update(backup)
+            return output
+
+        pe.env[self.funcname] = lambda *args: invoke(args)
+        return ""
+
 class CaptureBlock(BlockTag):
     """
     Capture all content within this tag, and bind it to a variable.
@@ -449,6 +494,15 @@ class InvalidCaptureBlockVariableName(PypageSyntaxError):
     def __init__(self, varname):
         self.description = "Incorrect CaptureBlock: '%s' is not a valid Python variable name." % varname
 
+class InvalidDefBlockFunctionOrArgName(PypageSyntaxError):
+    def __init__(self, varname):
+        self.description = "Incorrect DefBlock: '%s' is not a valid function or argument name." % varname
+
+class InvalidDefBlockMismatchingArgCount(PypageSyntaxError):
+    def __init__(self, argnames, args):
+        self.description = "Incorrect DefBlock function call: expected %d arguments (%s) but received %d arguments (%s) instead." % (
+            len(argnames), ', '.join(argnames), len(args), ', '.join(map(repr, args)))
+
 class UnknownTag(PypageSyntaxError):
     def __init__(self, node):
         self.description = "Unknown tag '%s%s%s' at line %d, column %d." % (

pypage-2.1.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-pypage.py,sha256=oEEr3pCIbKbDoAIYL8vANUtRb4Wbll9IvYMWID0xEng,29037
-pypage-2.1.0.dist-info/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pypage-2.1.0.dist-info/METADATA,sha256=TvOBibltTKqFxxy_4-sZ0Y8lHIrZVPo2wX0do03nVF4,18152
-pypage-2.1.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-pypage-2.1.0.dist-info/entry_points.txt,sha256=iHPN6EfIUdv-njh8GV04yDTzkcCLGNcXvdbA43s_8mo,39
-pypage-2.1.0.dist-info/top_level.txt,sha256=8AAB15dVQEt9xcwH_eLcVUZEbFlc__81RA5mOrYtJiQ,7
-pypage-2.1.0.dist-info/RECORD,,