diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-02 09:08:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-02 11:07:34 +0100 |
| commit | 91be7943121cfbc0dacc49848fa8f27d72c54c34 (patch) | |
| tree | bd78a858d460a24861e9dec0bf4c723c0a9b6b83 /python | |
| parent | 14d3b8226d1e98855d44971656ae327aa25948fe (diff) | |
Resolves: fdo#36763 backport fix for py#4768
Diffstat (limited to 'python')
| -rw-r--r-- | python/Python-2.6.1-py4768.patch | 11 | ||||
| -rw-r--r-- | python/makefile.mk | 3 |
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 000000000000..7617f5dbec53 --- /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 ad9783feac2d..4f50ed3bcccf 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= |