Update h function import in core

Author: fabiommendes

src/hyperpython/__init__.py

@@ -1,141 +1,136 @@
 """
 Core Hyperpython API
 """
-__version__ = "1.0.2"
+__version__ = "1.1.0"
 __author__ = "Fábio Macêdo Mendes"
 
-# Ugly hack to make it possible to store __version__ directly on __init__.py
-try:
- from .core import Element, Text, Blob, Block, Json, Component
- from .html import html, render
- from .tags import (
- HTML5,
- h,
- body,
- head,
- meta,
- link,
- title,
- div,
- span,
- article,
- aside,
- details,
- footer,
- figcaption,
- figure,
- header,
- main,
- p,
- pre,
- section,
- embed,
- iframe,
- noscript,
- object_,
- script,
- style,
- button,
- fieldset,
- form,
- input_,
- keygen,
- label,
- legend,
- optgroup,
- option,
- select,
- textarea,
- h1,
- h2,
- h3,
- h4,
- h5,
- h6,
- dd,
- dl,
- dt,
- ul,
- li,
- ol,
- area,
- audio,
- canvas,
- img,
- picture,
- track,
- video,
- source,
- a,
- menu,
- menuitem,
- nav,
- abbr,
- blockquote,
- code,
- caption,
- col,
- colgroup,
- table,
- tbody,
- td,
- tfoot,
- th,
- thead,
- tr,
- b,
- em,
- del_,
- i,
- ins,
- mark,
- q,
- s,
- small,
- strong,
- sub,
- sup,
- u,
- br,
- hr,
- wbr,
- bdi,
- bdo,
- rp,
- rt,
- ruby,
- address,
- dialog,
- base,
- cite,
- datalist,
- dfn,
- kbd,
- map_,
- meter,
- param,
- progress,
- samp,
- summary,
- time,
- var,
- output,
- acronym,
- applet,
- big,
- basefont,
- center,
- dir_,
- font,
- frame,
- frameset,
- noframes,
- strike,
- tt,
- )
- from .utils import escape, unescape, safe, sanitize
- from .fragment import fragment, FragmentNotFound
- from .helpers import classes
-except ImportError as exc:
- print("Caught exception:", exc)
- print("This is expected during installation.")
+from .core import Element, Text, Blob, Block, Json, Component
+from .fragment import fragment, FragmentNotFound
+from .helpers import classes
+from .html import html, render
+from .tags import (
+ HTML5,
+ h,
+ body,
+ head,
+ meta,
+ link,
+ title,
+ div,
+ span,
+ article,
+ aside,
+ details,
+ footer,
+ figcaption,
+ figure,
+ header,
+ main,
+ p,
+ pre,
+ section,
+ embed,
+ iframe,
+ noscript,
+ object_,
+ script,
+ style,
+ button,
+ fieldset,
+ form,
+ input_,
+ keygen,
+ label,
+ legend,
+ optgroup,
+ option,
+ select,
+ textarea,
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6,
+ dd,
+ dl,
+ dt,
+ ul,
+ li,
+ ol,
+ area,
+ audio,
+ canvas,
+ img,
+ picture,
+ track,
+ video,
+ source,
+ a,
+ menu,
+ menuitem,
+ nav,
+ abbr,
+ blockquote,
+ code,
+ caption,
+ col,
+ colgroup,
+ table,
+ tbody,
+ td,
+ tfoot,
+ th,
+ thead,
+ tr,
+ b,
+ em,
+ del_,
+ i,
+ ins,
+ mark,
+ q,
+ s,
+ small,
+ strong,
+ sub,
+ sup,
+ u,
+ br,
+ hr,
+ wbr,
+ bdi,
+ bdo,
+ rp,
+ rt,
+ ruby,
+ address,
+ dialog,
+ base,
+ cite,
+ datalist,
+ dfn,
+ kbd,
+ map_,
+ meter,
+ param,
+ progress,
+ samp,
+ summary,
+ time,
+ var,
+ output,
+ acronym,
+ applet,
+ big,
+ basefont,
+ center,
+ dir_,
+ font,
+ frame,
+ frameset,
+ noframes,
+ strike,
+ tt,
+)
+from .utils import escape, unescape, safe, sanitize

src/hyperpython/contrib/milligram.py

@@ -30,15 +30,15 @@ def cdn():
 # Forms and buttons
 #
 def button(
-  text,
-  *,
-  href=None,
-  submit=False,
-  reset=False,
-  form=False,
-  outline=False,
-  clear=False,
-  **kwargs,
+ text,
+ *,
+ href=None,
+ submit=False,
+ reset=False,
+ form=False,
+ outline=False,
+ clear=False,
+ **kwargs,
 ):
  """
  A styled button element.
@@ -128,14 +128,14 @@ def row(*children, padding=True, wrap=False, align=None, **kwargs):
 
 
 def column(
-  *children,
-  size=None,
-  offset=None,
-  top=False,
-  bottom=False,
-  center=None,
-  align=None,
-  **kwargs,
+ *children,
+ size=None,
+ offset=None,
+ top=False,
+ bottom=False,
+ center=None,
+ align=None,
+ **kwargs,
 ):
  """
  A single column inside a flexible row.

src/hyperpython/core.py

@@ -11,6 +11,24 @@
 from .renderers import dump_attrs, render_pretty
 from .utils import escape as _escape
 
+# https://www.w3.org/TR/html5/syntax.html#void-elements
+VOID_ELEMENTS = {
+ "area",
+ "base",
+ "br",
+ "col",
+ "embed",
+ "hr",
+ "img",
+ "input",
+ "keygen",
+ "link",
+ "meta",
+ "param",
+ "source",
+ "track",
+ "wbr",
+}
 SEQUENCE_TYPES = (tuple, list, type(x for x in []), type(map(lambda: 0, [])))
 JUPYTER_NOTEBOOK_RENDER_HTML = True
 cte = lambda value: lambda *args: value
@@ -424,6 +442,7 @@ def as_attr(name, value):
  return name, value
  return name, value
 
+
 def as_child(value):
  """
  Convert arbitrary object to a compatible Element object.
@@ -438,7 +457,7 @@ def as_child(value):
  elif isinstance(value, (int, float)):
  return Text(str(value))
  elif isinstance(value, Tag):
- return h(value.tag)
+ return Element(value.tag, {}, [], value.tag in VOID_ELEMENTS)
  elif hasattr(value, "__html__"):
  return Blob(value.__html__())
  elif hasattr(value, "__hyperpython__"):
@@ -466,16 +485,21 @@ class Tag:
  Return an HTMLTag subclass for the given tag.
  """
 
- _h_function: callable = None
+ _h_function: callable
 
  def __init__(self, tag, help_text=None):
  self.tag = tag
  self.__doc__ = help_text
 
  def __call__(self, *args, **kwargs):
- return self._h_function(self.tag, *args, **kwargs)
+ try:
+ h = self._h_function
+ except AttributeError:
+ from .tags import h
+ Tag._h_function = h
+ return h(self.tag, *args, **kwargs)
 
  def __getitem__(self, item):
  return self._h_function(self.tag)[item]
 
-from .tags import h
+