fix: drowned fixes

yourlabs · Nov 7, 2022 · 996f7df · 996f7df
1 parent 6f5a337
commit 996f7df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/ryzom/components.py b/src/ryzom/components.py
@@ -257,6 +257,8 @@ def __getattr__(self, name):
     def __init__(self, *content, **attrs):
         cls = type(self)
         self.content = list(content) or []
+        if 'content' in attrs:
+            self.content += attrs['content']
 
         for key in [*attrs.keys()]:
             value = attrs[key]
@@ -444,7 +446,7 @@ def to_html(self, *content, attrs=None, **context):
             html = f'<{self.tag} {attrs}>'
         else:
             html = f'<{self.tag} {attrs}>'
-            content = content or self.content
+            content = list(content) or self.content
             html += self.content_html(*content, **context)
             if render_js_str := self.render_js():
                 html += '\n'.join([

diff --git a/src/ryzom_codec/parser.py b/src/ryzom_codec/parser.py
@@ -122,7 +122,7 @@ def get_token(self):
     @staticmethod
     def safe_attr_name(name):
         if name == "class":
-            return "xclass"
+            return "cls"
         if name == "for":
             return "xfor"
         return name.replace('-', '_').replace(':', 'COLON')