[Jython-checkins] jython (merge default -> default): merge

[shashank.bharadwaj]

http://hg.python.org/jython/rev/c614d45fdd74
changeset:   6592:c614d45fdd74
parent:      6591:a6ff07bed361
parent:      6590:2ee18829e246
user:        Shashank Bharadwaj <shanka.mns at gmail.com>
date:        Sat Apr 14 12:52:42 2012 -0600
summary:
  merge

files:
  Lib/test/test_xmlrpc.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -145,7 +145,7 @@
                          xmlrpclib.loads(strg)[0][0])
         self.assertRaises(TypeError, xmlrpclib.dumps, (arg1,))
 
-    @unittest.skipIf(test_support.is_jython, "FIXME: #1857 not working in Jython")
+    @unittest.skipIf(test_support.is_jython, "FIXME: #1875 not working in Jython")
     def test_default_encoding_issues(self):
         # SF bug #1115989: wrong decoding in '_stringify'
         utf8 = """<?xml version='1.0' encoding='iso-8859-1'?>

-- 
Repository URL: http://hg.python.org/jython