Attachment 838378 Details for Bug 1036393 – /tmp/

[patch] /tmp/

0001-Fix-encoding-for-XRDS-in-python3.patch (text/plain), 1.08 KB, created by Stanislav Ochotnicky on 2013-12-18 14:42:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislav Ochotnicky

Created: 2013-12-18 14:42:43 UTC

Size: 1.08 KB

patch

obsolete

>From 5add6b5d4c23cf6f6384eeb47d1cfe4dfe49f38c Mon Sep 17 00:00:00 2001
>From: Stanislav Ochotnicky <sochotnicky@redhat.com>
>Date: Wed, 18 Dec 2013 15:23:23 +0100
>Subject: [PATCH] Fix encoding for XRDS in python3
>
>argument 'text' for ElementTree.XML (fromstring method) is not always bytes but
>unicode strings and parser bails because it should itself decide which encoding
>is being used based on declaration in XML (defaulting to UTF-8). Ideally we'd
>get bytes always instead of unicode strings but that would require more
>substantial changes and verification. Do a simple conversion
>---
> openid/yadis/etxrd.py | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/openid/yadis/etxrd.py b/openid/yadis/etxrd.py
>index ee0c5dd..16fd93a 100644
>--- a/openid/yadis/etxrd.py
>+++ b/openid/yadis/etxrd.py
>@@ -66,6 +66,8 @@ def parseXRDS(text):
>         not contain an XRDS.
>     """
>     try:
>+        if isinstance(text, str):
>+            text = text.encode('utf-8')
>         element = ElementTree.XML(text)
>     except XMLError as why:
>         exc = XRDSError('Error parsing document as XML')
>-- 
>1.8.3.2
>

Actions: View | Diff

Attachments on bug 1036393: 838378