Merge lp:~cjwatson/lazr.smtptest/py37 into lp:lazr.smtptest

Proposed by Colin Watson
Status: Merged
Merged at revision: 75
Proposed branch: lp:~cjwatson/lazr.smtptest/py37
Merge into: lp:lazr.smtptest
Prerequisite: lp:~cjwatson/lazr.smtptest/py36
Diff against target: 46 lines (+6/-2)
4 files modified
lazr/smtptest/controller.py (+1/-1)
lazr/smtptest/docs/NEWS.rst (+2/-0)
setup.py (+2/-0)
tox.ini (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/lazr.smtptest/py37
Reviewer Review Type Date Requested Status
Ioana Lasc Approve
LAZR Developers Pending
Review via email: mp+374695@code.launchpad.net

Commit message

Add support for Python 3.7 and 3.8.

Description of the change

We no longer try to raise StopIteration from a generator.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lazr/smtptest/controller.py'
2--- lazr/smtptest/controller.py 2015-01-06 02:58:54 +0000
3+++ lazr/smtptest/controller.py 2019-10-24 22:52:31 +0000
4@@ -128,4 +128,4 @@
5 try:
6 yield self.queue.get_nowait()
7 except Empty:
8- raise StopIteration
9+ return
10
11=== modified file 'lazr/smtptest/docs/NEWS.rst'
12--- lazr/smtptest/docs/NEWS.rst 2019-10-24 22:52:31 +0000
13+++ lazr/smtptest/docs/NEWS.rst 2019-10-24 22:52:31 +0000
14@@ -8,6 +8,8 @@
15 pass the `decode_data=False` parameter when constructing `SMTPChannel` and
16 `SMTPServer` objects, and handle the new `SMTPServer.process_message`
17 signature. (LP: #1654334)
18+- Add support for Python 3.7 and 3.8. We no longer try to raise
19+ StopIteration from a generator. (LP: #1781564)
20
21 2.0.3 (2015-01-05)
22 ==================
23
24=== modified file 'setup.py'
25--- setup.py 2019-10-24 22:52:31 +0000
26+++ setup.py 2019-10-24 22:52:31 +0000
27@@ -55,6 +55,8 @@
28 'Programming Language :: Python :: 3.4',
29 'Programming Language :: Python :: 3.5',
30 'Programming Language :: Python :: 3.6',
31+ 'Programming Language :: Python :: 3.7',
32+ 'Programming Language :: Python :: 3.8',
33 ],
34 # nose plugins don't really work with `python setup.py test` so use
35 # `python setup.py nosetests` instead, or just `tox`. Gosh, we really
36
37=== modified file 'tox.ini'
38--- tox.ini 2019-10-24 22:52:31 +0000
39+++ tox.ini 2019-10-24 22:52:31 +0000
40@@ -1,5 +1,5 @@
41 [tox]
42-envlist = py27,py32,py33,py34,py35,py36
43+envlist = py27,py32,py33,py34,py35,py36,py37,py38
44
45 [testenv]
46 commands = python setup.py nosetests

Subscribers

People subscribed via source and target branches

to all changes: