Changeset 2539:7205ad5bb69d in livinglogic.python.xist

Timestamp:

06/01/06 13:34:44 (14 years ago)

Author:

Walter Doerwald <walter@…>

Branch:

default

Message:

Move indent from xml2py to the module, so it can be overwritten in
derived modules.

Files:

• src/ll/xist/ns/venom.py (modified) (2 diffs)

src/ll/xist/ns/venom.py

@@ -208 +208 @@
 
 
+# Used for indenting Python source code
+indent = "\t"
+
+
 @classmethod
 def xml2py(cls, source):
     stack = []
-    indent = "\t"
     lines = [
         "# generated by %s %s on %s UTC" % (__file__, __version__, datetime.datetime.utcnow()),
@@ -229 +232 @@
         if t is unicode:
             if any(issubclass(item[0], def_) for item in stack):
-                lines.append("%syield %r" % (len(stack)*indent, s))
+                lines.append("%syield %r" % (len(stack)*cls.indent, s))
             # ignore output outside of functions
         elif issubclass(t, expr):
             if any(issubclass(item[0], def_) for item in stack):
-                lines.append("%syield %s" % (len(stack)*indent, s))
+                lines.append("%syield %s" % (len(stack)*cls.indent, s))
             # ignore output outside of functions
         elif issubclass(t, textexpr):
             if any(issubclass(item[0], def_) for item in stack):
-                lines.append("%syield __venom_escapetext__(%s)" % (len(stack)*indent, s))
+                lines.append("%syield __venom_escapetext__(%s)" % (len(stack)*cls.indent, s))
             # ignore output outside of functions
         elif issubclass(t, attrexpr):
             if any(issubclass(item[0], def_) for item in stack):
-                lines.append("%syield __venom_escapeattr__(%s)" % (len(stack)*indent, s))
+                lines.append("%syield __venom_escapeattr__(%s)" % (len(stack)*cls.indent, s))
             # ignore output outside of functions
         elif issubclass(t, code):
-            lines.append("%s%s" % (len(stack)*indent, s))
+            lines.append("%s%s" % (len(stack)*cls.indent, s))
         elif issubclass(t, def_):
-            lines.append("%sdef %s:" % (len(stack)*indent, s))
+            lines.append("%sdef %s:" % (len(stack)*cls.indent, s))
             stack.append((t, s))
         elif issubclass(t, enddef):
             endscope(def_)
         elif issubclass(t, class_):
-            lines.append("%sclass %s:" % (len(stack)*indent, s))
+            lines.append("%sclass %s:" % (len(stack)*cls.indent, s))
             stack.append((t, s))
         elif issubclass(t, endclass):
             endscope(class_)
         elif issubclass(t, for_):
-            lines.append("%sfor %s:" % (len(stack)*indent, s))
+            lines.append("%sfor %s:" % (len(stack)*cls.indent, s))
             stack.append((t, s))
         elif issubclass(t, endfor):
             endscope(for_)
         elif issubclass(t, if_):
-            lines.append("%sif %s:" % (len(stack)*indent, s))
+            lines.append("%sif %s:" % (len(stack)*cls.indent, s))
             stack.append((t, s))
         elif issubclass(t, else_):
-            lines.append("%selse:" % ((len(stack)-1)*indent))
+            lines.append("%selse:" % ((len(stack)-1)*cls.indent))
         elif issubclass(t, elif_):
-            lines.append("%selif %s:" % ((len(stack)-1)*indent, s))
+            lines.append("%selif %s:" % ((len(stack)-1)*cls.indent, s))
         elif issubclass(t, endif):
             endscope(if_)