summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-02 09:08:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-02 11:07:34 +0100
commit491dab7d62dc42a13d56fe82cc33c2fb312ee30f (patch)
tree8f8f99821da290c9c33da8607be7e43ee0a05553
parent0447bdf4ed208eb09f8d1eecd7c143825afd8f06 (diff)
Resolves: fdo#36763 backport fix for py#4768
-rw-r--r--python/Python-2.6.1-py4768.patch11
-rw-r--r--python/makefile.mk3
2 files changed, 13 insertions, 1 deletions
diff --git a/python/Python-2.6.1-py4768.patch b/python/Python-2.6.1-py4768.patch
new file mode 100644
index 0000000..7617f5d
--- /dev/null
+++ b/python/Python-2.6.1-py4768.patch
@@ -0,0 +1,11 @@
+--- misc/Python-2.6.1/Lib/email/encoders.py
++++ misc/build/Python-2.6.1/Lib/email/encoders.py
+@@ -42,7 +42,7 @@
+ Also, add an appropriate Content-Transfer-Encoding header.
+ """
+ orig = msg.get_payload()
+- encdata = _bencode(orig)
++ encdata = str(_bencode(orig)).encode('ascii')
+ msg.set_payload(encdata)
+ msg['Content-Transfer-Encoding'] = 'base64'
+
diff --git a/python/makefile.mk b/python/makefile.mk
index ad9783f..4f50ed3 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -56,7 +56,8 @@ PATCH_FILES=\
Python-2.6.1-urllib.patch \
Python-2.6.1-sysbase.patch \
Python-2.6.1-nohardlink.patch \
- Python-2.6.1-py2422.patch
+ Python-2.6.1-py2422.patch \
+ Python-2.6.1-py4768.patch
CONFIGURE_DIR=