omserv 0.0.0.dev18__tar.gz → 0.0.0.dev19__tar.gz

{omserv-0.0.0.dev18/omserv.egg-info → omserv-0.0.0.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev18
+Version: 0.0.0.dev19
 Summary: omserv
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev18
+Requires-Dist: omlish==0.0.0.dev19
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

{omserv-0.0.0.dev18 → omserv-0.0.0.dev19}/omserv/apps/inject.py

@@ -16,8 +16,8 @@ from .routes import _HandlesAppMarker
 from .sessions import SESSION
 from .sessions import _WithSessionAppMarker
 from .sessions import _WithSessionAppMarkerProcessor
-from .templates import J2Namespace
-from .templates import J2Templates
+from .templates import JinjaNamespace
+from .templates import JinjaTemplates
 
 
 def bind_handler(hc: type[Handler_]) -> inj.Elemental:
@@ -76,14 +76,14 @@ def bind() -> inj.Elemental:
     )
 
 
-def _build_j2_namespaces(ns: ta.Annotated[ta.Mapping[str, ta.Any], inj.Tag(J2Namespace)]) -> J2Namespace:
-    return J2Namespace(ns)
+def _build_jinja_namespaces(ns: ta.Annotated[ta.Mapping[str, ta.Any], inj.Tag(JinjaNamespace)]) -> JinjaNamespace:
+    return JinjaNamespace(ns)
 
 
 def bind_templates() -> inj.Elemental:
     return inj.as_elements(
-        inj.bind(J2Templates, singleton=True),
+        inj.bind(JinjaTemplates, singleton=True),
 
-        inj.map_binder[str, ta.Any](tag=J2Namespace),
-        inj.bind(_build_j2_namespaces),
+        inj.map_binder[str, ta.Any](tag=JinjaNamespace),
+        inj.bind(_build_jinja_namespaces),
     )

{omserv-0.0.0.dev18 → omserv-0.0.0.dev19}/omserv/apps/templates.py

@@ -14,30 +14,30 @@ log = logging.getLogger(__name__)
 ##
 
 
-J2_DEFAULT_NAMESPACE = {}
+JINJA_DEFAULT_NAMESPACE = {}
 
 
-def j2_helper(fn):
-    J2_DEFAULT_NAMESPACE[fn.__name__] = fn
+def jinja_helper(fn):
+    JINJA_DEFAULT_NAMESPACE[fn.__name__] = fn
     return fn
 
 
-j2_helper(url_for)
+jinja_helper(url_for)
 
 
 ##
 
 
-J2Namespace = ta.NewType('J2Namespace', ta.Mapping[str, ta.Any])
+JinjaNamespace = ta.NewType('JinjaNamespace', ta.Mapping[str, ta.Any])
 
 
-class J2Templates:
+class JinjaTemplates:
     @dc.dataclass(frozen=True)
     class Config:
         resource_root: str
         reload: bool = False
 
-    def __init__(self, config: Config, ns: J2Namespace) -> None:
+    def __init__(self, config: Config, ns: JinjaNamespace) -> None:
         super().__init__()
 
         self._config = config
@@ -51,7 +51,7 @@ class J2Templates:
         self._all: ta.Mapping[str, jinja2.Template] | None = None
 
     class _Loader(jinja2.BaseLoader):
-        def __init__(self, owner: 'J2Templates') -> None:
+        def __init__(self, owner: 'JinjaTemplates') -> None:
             super().__init__()
             self._owner = owner
 
@@ -84,7 +84,7 @@ class J2Templates:
 
     def render(self, template_name: str, **kwargs: ta.Any) -> bytes:
         return self.load(template_name).render(**{
-            **J2_DEFAULT_NAMESPACE,
+            **JINJA_DEFAULT_NAMESPACE,
             **self._ns,
             **kwargs,
         }).encode()

{omserv-0.0.0.dev18 → omserv-0.0.0.dev19/omserv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev18
+Version: 0.0.0.dev19
 Summary: omserv
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev18
+Requires-Dist: omlish==0.0.0.dev19
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

{omserv-0.0.0.dev18 → omserv-0.0.0.dev19}/omserv.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev18
+omlish==0.0.0.dev19
 
 [all]
 h11~=0.14

{omserv-0.0.0.dev18 → omserv-0.0.0.dev19}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev18'
+version = '0.0.0.dev19'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omserv'
 dependencies = [
-    'omlish == 0.0.0.dev18',
+    'omlish == 0.0.0.dev19',
 ]
 
 [project.optional-dependencies]