Merge remote-tracking branch 'upstream/master'

Conflicts:
	email_extras/__init__.py

AUTHORS

@@ -6,4 +6,5 @@
 * Eric Amador
 * Thomas Stols
 * Mario Rosa
-* Adrian Bohdanowicz
+* Adrian Bohdanowicz
+* Tim Heithecker

email_extras/__init__.py

@@ -1,2 +1,2 @@
 
-__version__ = "0.3.4"
+__version__ = "0.3.3"

email_extras/backends.py

@@ -23,7 +23,7 @@ def send_messages(self, email_messages):
                     self.open(body)
 
     def open(self, body):
-        temp = NamedTemporaryFile(delete=False)
-        temp.write(body)
-        temp.close()
+        with NamedTemporaryFile(delete=False) as temp:
+            temp.write(body.encode('utf-8'))
+
         webbrowser.open("file://" + temp.name)

email_extras/settings.py

@@ -6,7 +6,7 @@
 GNUPG_HOME = getattr(settings, "EMAIL_EXTRAS_GNUPG_HOME", None)
 USE_GNUPG = getattr(settings, "EMAIL_EXTRAS_USE_GNUPG", GNUPG_HOME is not None)
 ALWAYS_TRUST = getattr(settings, "EMAIL_EXTRAS_ALWAYS_TRUST_KEYS", False)
-
+GNUPG_ENCODING = getattr(settings, "EMAIL_EXTRAS_GNUPG_ENCODING", None)
 
 if USE_GNUPG:
     try:

email_extras/utils.py

@@ -6,7 +6,8 @@
 from django.utils import six
 from django.utils.encoding import smart_text
 
-from email_extras.settings import USE_GNUPG, GNUPG_HOME, ALWAYS_TRUST
+from email_extras.settings import (USE_GNUPG, GNUPG_HOME, ALWAYS_TRUST,
+                                   GNUPG_ENCODING)
 
 
 if USE_GNUPG:
@@ -47,6 +48,8 @@ def send_mail(subject, body_text, addr_from, addr_to, fail_silently=False,
         # Create the gpg object.
         if key_addresses:
             gpg = GPG(gnupghome=GNUPG_HOME)
+            if GNUPG_ENCODING is not None:
+                gpg.encoding = GNUPG_ENCODING
 
     # Check if recipient has a gpg key installed
     def has_pgp_key(addr):