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

[Colin Watson]

Add support for Python 3.6.

As of 3.5 (when it became possible), we now pass the `decode_data=False` parameter when constructing `SMTPChannel` and `SMTPServer` objects, and handle the new `SMTPServer.process_message` signature.

[Ioana Lasc (ilasc)]

review: Approve

=== modified file 'lazr/smtptest/docs/NEWS.rst'
--- lazr/smtptest/docs/NEWS.rst	2015-01-06 02:58:54 +0000
+++ lazr/smtptest/docs/NEWS.rst	2019-10-24 22:44:30 +0000
@@ -2,6 +2,13 @@
 NEWS for lazr.smtptest
 ======================
 
+2.0.4
+=====
+- Add support for Python 3.6.  As of 3.5 (when it became possible), we now
+  pass the `decode_data=False` parameter when constructing `SMTPChannel` and
+  `SMTPServer` objects, and handle the new `SMTPServer.process_message`
+  signature.  (LP: #1654334)
+
 2.0.3 (2015-01-05)
 ==================
 - Always use old-style namespace package registration in ``lazr/__init__.py``
 
=== modified file 'lazr/smtptest/server.py'
--- lazr/smtptest/server.py	2015-01-06 02:58:54 +0000
+++ lazr/smtptest/server.py	2019-10-24 22:44:30 +0000
@@ -26,10 +26,11 @@
     ]
 
 
+import asyncore
+import logging
 import smtpd
 import socket
-import logging
-import asyncore
+import sys
 
 try:
     from queue import Empty
@@ -37,7 +38,10 @@
     # Python 2
     from Queue import Empty
 
-from email import message_from_string
+if sys.version >= '3.5':
+    from email import message_from_bytes
+else:
+    from email import message_from_string
 
 
 COMMASPACE = ', '
@@ -49,7 +53,10 @@
 
     def __init__(self, server, connection, address):
         self._server = server
-        smtpd.SMTPChannel.__init__(self, server, connection, address)
+        kwargs = {}
+        if sys.version >= '3.5':
+            kwargs["decode_data"] = False
+        smtpd.SMTPChannel.__init__(self, server, connection, address, **kwargs)
 
     def smtp_EXIT(self, argument):
         """EXIT - a new SMTP command to cleanly stop the server."""
@@ -96,7 +103,10 @@
         self.host = host
         self.port = port
         self.socket_map = {}
-        smtpd.SMTPServer.__init__(self, (host, port), None)
+        kwargs = {}
+        if sys.version >= '3.5':
+            kwargs['decode_data'] = False
+        smtpd.SMTPServer.__init__(self, (host, port), None, **kwargs)
         self.set_reuse_addr()
         log.info('[SMTPServer] listening: %s:%s', host, port)
 
@@ -116,11 +126,14 @@
         log.info('[SMTPServer] accepted: %s', address)
         Channel(self, connection, address)
 
-    def process_message(self, peer, mailfrom, rcpttos, data):
+    def process_message(self, peer, mailfrom, rcpttos, data, **kwargs):
         """Process a received message."""
         log.info('[SMTPServer] processing: %s, %s, %s, size=%s',
                  peer, mailfrom, rcpttos, len(data))
-        message = message_from_string(data)
+        if sys.version >= '3.5':
+            message = message_from_bytes(data)
+        else:
+            message = message_from_string(data)
         message['X-Peer'] = '%s:%s' % (peer[0], peer[1])
         message['X-MailFrom'] = mailfrom
         message['X-RcptTo'] = COMMASPACE.join(rcpttos)
 
=== modified file 'setup.py'
--- setup.py	2015-01-06 02:58:54 +0000
+++ setup.py	2019-10-24 22:44:30 +0000
@@ -50,6 +50,11 @@
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         ],
     # 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	2014-08-20 15:58:13 +0000
+++ tox.ini	2019-10-24 22:44:30 +0000
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py32,py33,py34
+envlist = py27,py32,py33,py34,py35,py36
 
 [testenv]
 commands = python setup.py nosetests