omserv 0.0.0.dev18__py3-none-any.whl → 0.0.0.dev20__py3-none-any.whl

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/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.dist-info → omserv-0.0.0.dev20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev18
+Version: 0.0.0.dev20
 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.dev20
 Provides-Extra: all
 Requires-Dist: h11 ~=0.14 ; extra == 'all'
 Requires-Dist: h2 ~=4.1 ; extra == 'all'

{omserv-0.0.0.dev18.dist-info → omserv-0.0.0.dev20.dist-info}/RECORD

@@ -4,11 +4,11 @@ omserv/dbs.py,sha256=RLXwNmENmM9MLsjFqDho_R8ibMjOKAxWUn4zhzTlP9Y,756
 omserv/secrets.py,sha256=ja0VsCB01MHxYwn5OHjFeXV9cRah9AQl-0uJzZELpic,256
 omserv/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omserv/apps/base.py,sha256=KSwxbC0_fY87_DucvpEOHG6gZ2wL78D-N3We8RTEU4Q,385
-omserv/apps/inject.py,sha256=RZjPcB_xEPhdw5Ki3rnKeHMqhJ8zFJZ_QZSrKpH-0xM,2670
+omserv/apps/inject.py,sha256=xtcn-C3A4yCdHfnAaejxrC_UGMVBYmWtSxeESIkorP0,2697
 omserv/apps/markers.py,sha256=LBVx9LTyKB2sPqDrMHjwVpqH3xDIRqMjlFFw1HsXOWI,867
 omserv/apps/routes.py,sha256=shcN8qCSF2YoKal7nk-lemCAK3RX8MuHgNHhq_CTnh0,3762
 omserv/apps/sessions.py,sha256=glruQSbOSbCYLPp6nDRNSHCyp5hj4oiOPhh3R0F9BTM,1537
-omserv/apps/templates.py,sha256=NyCsKmPaLsGYc1mWyGiC7EcYsisQhq-wWdrnHnbwxC8,2095
+omserv/apps/templates.py,sha256=PBRZHIF9UbnFnq-4EC6RmPeRkeH8lCBbpJkSdseHs6A,2125
 omserv/node/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omserv/node/models.py,sha256=XsfAI-LjlRkRfK0_ofh-gai5IUq_g357UfThK9dZ0UM,1258
 omserv/node/registry.py,sha256=0hodmyQn3POOZJBG8zTr9ojR80-ZNmIwJpQbchJg8EM,3459
@@ -37,8 +37,8 @@ omserv/server/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 omserv/server/streams/httpstream.py,sha256=0DeiAPLGbEGNa0fHTs8lUpi_CFZs4M5_QB-TiS8mobQ,8015
 omserv/server/streams/utils.py,sha256=aMOrqWIg_Hht5W4kLg3y7oR5AEkVvMrZhyjzo6U5owE,1527
 omserv/server/streams/wsstream.py,sha256=3Vyzox7dCE1tDSXjb6xBubWo41ZF9d38Hrsrlj6h1J8,15482
-omserv-0.0.0.dev18.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omserv-0.0.0.dev18.dist-info/METADATA,sha256=8ICHUpneD03Mdr7M4UTijNoybSrHW7nmq_yECX4hQuM,881
-omserv-0.0.0.dev18.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-omserv-0.0.0.dev18.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
-omserv-0.0.0.dev18.dist-info/RECORD,,
+omserv-0.0.0.dev20.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omserv-0.0.0.dev20.dist-info/METADATA,sha256=itWiSGmvOhm-iBV4XOsCFQN6gHiJHajywrNKkbvEUzs,881
+omserv-0.0.0.dev20.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+omserv-0.0.0.dev20.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
+omserv-0.0.0.dev20.dist-info/RECORD,,