[Python-modules-commits] [pytest-localserver] 04/05: Added py35-fix.patch (Closes: #801302).

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository pytest-localserver.

commit 5c77d9754d690e2e699a89410f3404851e28cd67
Merge: 7862dee 44aa43e
Author: Daniel Stender <debian at danielstender.com>
Date:   Sun Oct 25 18:37:37 2015 +0100

    Added py35-fix.patch (Closes: #801302).

 debian/.git-dpm                    |  4 ++--
 debian/changelog                   |  3 ++-
 debian/patches/0001-py35-fix.patch | 39 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 pytest_localserver/smtp.py         |  2 +-
 tests/test_smtp.py                 |  2 +-
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 81616e8,0000000..5c44496
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- a735e4ef0b6f7ddd7104ab8ae58c9de2ae485216
- a735e4ef0b6f7ddd7104ab8ae58c9de2ae485216
++44aa43e9e0e4d31a00bdb403e5670c790aafe475
++44aa43e9e0e4d31a00bdb403e5670c790aafe475
 +a735e4ef0b6f7ddd7104ab8ae58c9de2ae485216
 +a735e4ef0b6f7ddd7104ab8ae58c9de2ae485216
 +pytest-localserver_0.3.4.orig.tar.gz
 +ca8b1b8922097333a99063f2e133a1ba1296c785
 +19607
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 651f4d0,0000000..09015b5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,0 +1,13 @@@
 +pytest-localserver (0.3.4-2) UNRELEASED; urgency=medium
 +
 +  * deb/control: updated Homepage.
 +  * deb/tests/: corrected names of scripts.
++  * Added py35-fix.patch (Closes: #801302).
 +
-  -- Daniel Stender <debian at danielstender.com>  Sun, 25 Oct 2015 18:23:37 +0100
++ -- Daniel Stender <debian at danielstender.com>  Sun, 25 Oct 2015 18:37:37 +0100
 +
 +pytest-localserver (0.3.4-1) unstable; urgency=medium
 +
 +  * Initial release (Closes: #792784)
 +
 + -- Daniel Stender <debian at danielstender.com>  Wed, 29 Jul 2015 19:48:59 +0200
diff --cc debian/patches/0001-py35-fix.patch
index 0000000,0000000..5fc30fb
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-py35-fix.patch
@@@ -1,0 -1,0 +1,39 @@@
++From 44aa43e9e0e4d31a00bdb403e5670c790aafe475 Mon Sep 17 00:00:00 2001
++From: Daniel Stender <debian at danielstender.com>
++Date: Sun, 25 Oct 2015 18:37:33 +0100
++Subject: py35-fix
++
++   fixes problems of SMTP server component with Python 3.5
++   Origin: https://bitbucket.org/pytest-dev/pytest-localserver/issues/13/broken-on-python-35
++   Bug: https://bugs.debian.org/801302
++---
++ pytest_localserver/smtp.py | 2 +-
++ tests/test_smtp.py         | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/pytest_localserver/smtp.py b/pytest_localserver/smtp.py
++index d5b945c..8ea4332 100644
++--- a/pytest_localserver/smtp.py
+++++ b/pytest_localserver/smtp.py
++@@ -34,7 +34,7 @@ class Server (smtpd.SMTPServer, threading.Thread):
++     def __init__(self, host='localhost', port=0):
++         smtpd.SMTPServer.__init__(self, (host, port), None)
++         if self._localaddr[1] == 0:
++-            self.addr = self.getsockname()
+++            self.addr = self.socket.getsockname()
++ 
++         self.outbox = []
++ 
++diff --git a/tests/test_smtp.py b/tests/test_smtp.py
++index 6f74174..ce302b4 100644
++--- a/tests/test_smtp.py
+++++ b/tests/test_smtp.py
++@@ -21,7 +21,7 @@ def send_plain_email(to, from_, subject, txt, server=('localhost', 25)):
++     msg['From'] = from_
++     msg['To'] = to
++ 
++-    host, port = server
+++    host, port = server[:2]
++     server = smtplib.SMTP(host, port)
++     server.set_debuglevel(1)
++     server.sendmail(from_, to, msg.as_string())
diff --cc debian/patches/series
index 0000000,0000000..5889c61
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-py35-fix.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pytest-localserver.git