From 39c1ef65f32fd8e6e872ce849159a51b43d2badd Mon Sep 17 00:00:00 2001 From: Mathias Rav Date: Fri, 1 May 2015 17:01:03 +0200 Subject: [PATCH] No such thing as bytes in Python 2 --- emailtunnel/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/emailtunnel/__init__.py b/emailtunnel/__init__.py index 437a6c5..202d7ee 100644 --- a/emailtunnel/__init__.py +++ b/emailtunnel/__init__.py @@ -83,7 +83,10 @@ def __init__(self, message=None): if message: assert isinstance(message, bytes) - self.message = email.message_from_bytes(message) + if six.PY3: + self.message = email.message_from_bytes(message) + else: + self.message = email.message_from_string(message) if not self._sanity_check(message): self._sanity_log_invalid(message)