[Python-modules-commits] [django-anymail] 04/05: Remove obsolete patches and patches directory
Scott Kitterman
kitterman at moszumanska.debian.org
Tue Jun 20 04:38:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
kitterman pushed a commit to branch debian/master
in repository django-anymail.
commit f976161260c90470dfcf6f4055eb552812b67a7e
Author: Scott Kitterman <scott at kitterman.com>
Date: Tue Jun 20 00:31:49 2017 -0400
Remove obsolete patches and patches directory
---
debian/patches/0001-fix-attachment-crash.patch | 32 --------------------------
debian/patches/series | 1 -
2 files changed, 33 deletions(-)
diff --git a/debian/patches/0001-fix-attachment-crash.patch b/debian/patches/0001-fix-attachment-crash.patch
deleted file mode 100644
index 632a96c..0000000
--- a/debian/patches/0001-fix-attachment-crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Date: Mon, 19 Jun 2017 20:56:53 -0400
-Subject: fix-attachment-crash
-
-7d7448011b961b742ab053f29e265a554eff8297
- anymail/utils.py | 6 ++++++
- tests/test_mailgun_backend.py | 26 ++++++++++++++++++++++++--
- tests/utils.py | 3 +++
- 3 files changed, 33 insertions(+), 2 deletions(-)
-Note: Test changes not included for simplicity (not run during package build
-anyway).
----
- anymail/utils.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/anymail/utils.py b/anymail/utils.py
-index 66c307a..f9e71ad 100644
---- a/anymail/utils.py
-+++ b/anymail/utils.py
-@@ -171,6 +171,12 @@ class Attachment(object):
- if isinstance(attachment, MIMEBase):
- self.name = attachment.get_filename()
- self.content = attachment.get_payload(decode=True)
-+ if self.content is None:
-+ if hasattr(attachment, 'as_bytes'):
-+ self.content = attachment.as_bytes()
-+ else:
-+ # Python 2.7 fallback
-+ self.content = attachment.as_string().encode(self.encoding)
- self.mimetype = attachment.get_content_type()
-
- if get_content_disposition(attachment) == 'inline':
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 440a266..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-fix-attachment-crash.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-anymail.git
More information about the Python-modules-commits
mailing list