# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1322116968 0
# Node ID b2dd573fd8ca06fbca873eaa877c6d632f4b55d1
# Parent  f8c2547c8f169eb06c45e38dbaae94b0f929d3f5# Parent  ab16e060541e87e63372eedc67b89b2d1a1b4029
Merge with default

diff -r f8c2547c8f16 -r b2dd573fd8ca tests/test-keyword.t
--- a/tests/test-keyword.t	Mon Nov 21 00:39:32 2011 +0100
+++ b/tests/test-keyword.t	Thu Nov 24 06:42:48 2011 +0000
@@ -309,8 +309,10 @@
 
 record chunk
 
-  $ python -c \
-  > 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);'
+  >>> lines = open('a').readlines()
+  >>> lines.insert(1, 'foo\n')
+  >>> lines.append('bar\n')
+  >>> open('a', 'w').writelines(lines)
   $ hg record -d '1 10' -m rectest a<<EOF
   > y
   > y
@@ -809,8 +811,9 @@
   
 Imported patch should not be rejected
 
-  $ python -c \
-  > 'import re; s=re.sub("(Id.*)","\\1 rejecttest",open("a").read()); open("a","wb").write(s);'
+  >>> import re
+  >>> text = re.sub(r'(Id.*)', r'\1 rejecttest', open('a').read())
+  >>> open('a', 'wb').write(text)
   $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>'
   a
   overwriting a expanding keywords