Commit e9441542 authored by Daniel Stender's avatar Daniel Stender

Updated version 0.3.7 from 'upstream/0.3.7'

with Debian dir b5224d1280f7e0ff921f35a2f7528c10aa4ec320
parents 44db72c8 6a1e2815
Metadata-Version: 1.1
Name: pytest-localserver
Version: 0.3.6
Version: 0.3.7
Summary: py.test plugin to test server connections locally.
Home-page: http://bitbucket.org/pytest-dev/pytest-localserver/
Author: Sebastian Rahlf
......
VERSION = '0.3.6'
VERSION = '0.3.7'
......@@ -43,11 +43,14 @@ class Server (smtpd.SMTPServer, threading.Thread):
self.threadName = self.__class__.__name__
threading.Thread.__init__(self, name=self.threadName)
def process_message(self, peer, mailfrom, rcpttos, data):
def process_message(self, peer, mailfrom, rcpttos, data, **kwargs):
"""
Adds message to outbox.
"""
self.outbox += [email.message_from_string(data)]
try:
self.outbox += [email.message_from_bytes(data)]
except AttributeError:
self.outbox += [email.message_from_string(data)]
def run(self):
"""
......
......@@ -2,7 +2,7 @@ from setuptools import setup, Command
import sys
VERSION = '0.3.6'
VERSION = '0.3.7'
def read(fname):
......
......@@ -30,7 +30,7 @@ def send_plain_email(to, from_, subject, txt, server=('localhost', 25)):
# define test fixture here again in order to run tests without having to
# install the plugin anew every single time
smtpsserver = plugin.smtpserver
smtpserver = plugin.smtpserver
def test_smtpserver_funcarg(smtpserver):
......
[tox]
envlist = py26,py27,py33,py34,py35
envlist = py26,py27,py33,py34,py35,py36
recreate = True
[tox:hudson]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment