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
=== modified file 'lazr/smtptest/controller.py'
--- lazr/smtptest/controller.py 2015-01-06 02:58:54 +0000
+++ lazr/smtptest/controller.py 2019-10-24 22:52:31 +0000
@@ -128,4 +128,4 @@
128 try:128 try:
129 yield self.queue.get_nowait()129 yield self.queue.get_nowait()
130 except Empty:130 except Empty:
131 raise StopIteration131 return
132132
=== modified file 'lazr/smtptest/docs/NEWS.rst'
--- lazr/smtptest/docs/NEWS.rst 2019-10-24 22:52:31 +0000
+++ lazr/smtptest/docs/NEWS.rst 2019-10-24 22:52:31 +0000
@@ -8,6 +8,8 @@
8 pass the `decode_data=False` parameter when constructing `SMTPChannel` and8 pass the `decode_data=False` parameter when constructing `SMTPChannel` and
9 `SMTPServer` objects, and handle the new `SMTPServer.process_message`9 `SMTPServer` objects, and handle the new `SMTPServer.process_message`
10 signature. (LP: #1654334)10 signature. (LP: #1654334)
11- Add support for Python 3.7 and 3.8. We no longer try to raise
12 StopIteration from a generator. (LP: #1781564)
1113
122.0.3 (2015-01-05)142.0.3 (2015-01-05)
13==================15==================
1416
=== modified file 'setup.py'
--- setup.py 2019-10-24 22:52:31 +0000
+++ setup.py 2019-10-24 22:52:31 +0000
@@ -55,6 +55,8 @@
55 'Programming Language :: Python :: 3.4',55 'Programming Language :: Python :: 3.4',
56 'Programming Language :: Python :: 3.5',56 'Programming Language :: Python :: 3.5',
57 'Programming Language :: Python :: 3.6',57 'Programming Language :: Python :: 3.6',
58 'Programming Language :: Python :: 3.7',
59 'Programming Language :: Python :: 3.8',
58 ],60 ],
59 # nose plugins don't really work with `python setup.py test` so use61 # nose plugins don't really work with `python setup.py test` so use
60 # `python setup.py nosetests` instead, or just `tox`. Gosh, we really62 # `python setup.py nosetests` instead, or just `tox`. Gosh, we really
6163
=== modified file 'tox.ini'
--- tox.ini 2019-10-24 22:52:31 +0000
+++ tox.ini 2019-10-24 22:52:31 +0000
@@ -1,5 +1,5 @@
1[tox]1[tox]
2envlist = py27,py32,py33,py34,py35,py362envlist = py27,py32,py33,py34,py35,py36,py37,py38
33
4[testenv]4[testenv]
5commands = python setup.py nosetests5commands = python setup.py nosetests

Subscribers

People subscribed via source and target branches

to all changes: