diff -r 000000000000 -r ae805ac0140d python-2.5.2/win32/Lib/test/test_getargs.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python-2.5.2/win32/Lib/test/test_getargs.py	Fri Apr 03 17:19:34 2009 +0100
@@ -0,0 +1,24 @@
+"""Test the internal getargs.c implementation
+
+ PyArg_ParseTuple() is defined here.
+
+The test here is not intended to test all of the module, just the
+single case that failed between 2.1 and 2.2a2.
+"""
+
+# marshal.loads() uses PyArg_ParseTuple(args, "s#:loads")
+# The s code will cause a Unicode conversion to occur.  This test
+# verify that the error is propagated properly from the C code back to
+# Python.
+
+# XXX If the encoding succeeds using the current default encoding,
+# this test will fail because it does not test the right part of the
+# PyArg_ParseTuple() implementation.
+from test.test_support import have_unicode
+import marshal
+
+if have_unicode:
+    try:
+        marshal.loads(unicode(r"\222", 'unicode-escape'))
+    except UnicodeError:
+        pass