Attachment 144419 Details for Bug 220843 – required patch

[patch] required patch

Changeset442.diff (text/plain), 2.37 KB, created by Jan ONDREJ on 2006-12-27 20:59:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan ONDREJ

Created: 2006-12-27 20:59:04 UTC

Size: 2.37 KB

patch

obsolete

>Index: trunk/kid/codewriter.py
>===================================================================
>--- trunk/kid/codewriter.py (revision 441)
>+++ trunk/kid/codewriter.py (revision 442)
>@@ -248,10 +248,10 @@
>             old_code = code
>             if '(' not in decl:
>-                decl = decl + '()'
>+                decl += '()'
>             name, args = decl.split('(', 1)
>-            pos = args.rfind(')')
>-            args = args[0:pos].strip()
>-            self_ = args and 'self, ' or 'self'
>-            class_decl = '%s(%s%s)' % (name, self_, args)
>+            args = args.lstrip()
>+            if not args.startswith(')'):
>+                args = ', ' + args
>+            class_decl = '(self'.join((name, args))
> 
>             # module function code
>@@ -271,6 +271,6 @@
>             self.match_proc(item, attrib, code)
>             code.end_block()
>-            code.start_block('def %s:' % class_decl)
>-            code.line('return ElementStream(self.__%s(%s))' % (name, args))
>+            code.start_block('def %s(self, *args, **kw):' % name)
>+            code.line('return ElementStream(self.__%s(*args, **kw))' % name)
>             code.end_block()
>             if attr_name == QNAME_SLOT:
>Index: trunk/test/test_def.kid
>===================================================================
>--- trunk/test/test_def.kid (revision 421)
>+++ trunk/test/test_def.kid (revision 442)
>@@ -9,4 +9,5 @@
> ?>
> <testdoc xmlns:py="http://purl.org/kid/ns#">
>+
>   <test>
>     <attempt py:content="template1()" />
>@@ -22,14 +23,14 @@
>     <h1>Some Fruit</h1>
>     <dl>
>-      
>+
>       <dt>orange</dt>
>       <dd>A juicy fruit from Florida mostly.</dd>
>-      
>+
>       <dt>m&amp;m's</dt>
>       <dd>melts in your mouth not in your hand.</dd>
>-      
>+
>       <dt>apple</dt>
>       <dd>A red fruit that hurts my teeth.</dd>
>-      
>+
>     </dl>
>   </test3></expect>
>@@ -38,5 +39,5 @@
>   
>   <p py:def="inline_test">a test paragraph</p>
>-  
>+
>   <test>
>     <attempt py:content="inline_test()"/>
>@@ -49,4 +50,14 @@
>   </test>
> 
>+  <p py:def="hello_world(x='World')" py:strip="">${x}</p>
>+
>+  <test>
>+    <attempt><p py:replace="hello_world(x='Hello')"/>,
>+    <p py:replace="hello_world()"/>!</attempt>
>+    <expect>Hello,
>+    World!</expect>
>+  </test>
>+
>   
>+
> </testdoc>

Actions: View | Diff

Attachments on bug 220843: 144419