diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-10 15:38:07 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2011-08-10 15:38:07 +0100 |
| commit | 5d90736d0b2608dec0920469e9fe671fe002bd66 (patch) | |
| tree | 7a0d1d001edd80783451746422fb63fc988314cc | |
| parent | 2206a1376f12fb2c30df935dbdfc4c3b00df0b6f (diff) | |
fdo#36763 backport fix for py#4768
Signed-off-by: Noel Power <noel.power@novell.com>
| -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 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 eb72a26..70d9024 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -50,7 +50,8 @@ PATCH_FILES=\ Python-parallel-make.patch \ Python-ssl.patch \ Python-aix.patch \ - Python-2.6.1-urllib.patch + Python-2.6.1-urllib.patch \ + Python-2.6.1-py4768.patch CONFIGURE_DIR= |