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

[Colin Watson]

Add support for Python 3.7 and 3.8.

We no longer try to raise StopIteration from a generator.

[Ioana Lasc (ilasc)]

review: Approve

=== 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 @@
             try:
                 yield self.queue.get_nowait()
             except Empty:
-                raise StopIteration
+                return
 
=== 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 @@
   pass the `decode_data=False` parameter when constructing `SMTPChannel` and
   `SMTPServer` objects, and handle the new `SMTPServer.process_message`
   signature.  (LP: #1654334)
+- Add support for Python 3.7 and 3.8.  We no longer try to raise
+  StopIteration from a generator.  (LP: #1781564)
 
 2.0.3 (2015-01-05)
 ==================
 
=== 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 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         ],
     # nose plugins don't really work with `python setup.py test` so use
     # `python setup.py nosetests` instead, or just `tox`.  Gosh, we really
 
=== 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 @@
 [tox]
-envlist = py27,py32,py33,py34,py35,py36
+envlist = py27,py32,py33,py34,py35,py36,py37,py38
 
 [testenv]
 commands = python setup.py nosetests