From: Guido van Rossum <guido@python.org>
Date: Fri, 31 Aug 2007 14:07:27 +0000 (+0000)
Subject: Fix fall-out of str.decode removal.
X-Git-Tag: v3.0a1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=261f9df18dce95075c6176da0cf3d6fd98ef45a4;p=thirdparty%2FPython%2Fcpython.git

Fix fall-out of str.decode removal.
---

diff --git a/Lib/xmlrpclib.py b/Lib/xmlrpclib.py
index 60b05b9711f6..e08d405543eb 100644
--- a/Lib/xmlrpclib.py
+++ b/Lib/xmlrpclib.py
@@ -167,7 +167,7 @@ def _stringify(string):
     # convert to 7-bit ascii if possible
     try:
         return string.decode("ascii")
-    except (UnicodeError, TypeError):
+    except (UnicodeError, TypeError, AttributeError):
         return string
 
 __version__ = "1.0.1"