From dc851fc557b2c231f90cb66049e0ea5789affd85 Mon Sep 17 00:00:00 2001
From: Michael Huang <mikhuang@gmail.com>
Date: Tue, 14 Feb 2017 12:34:53 -0800
Subject: [PATCH 1/3] Force message to be unicode to avoid encoding issues

---
 helpdesk/management/commands/get_email.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py
index 97b5b8cc..26c63a73 100644
--- a/helpdesk/management/commands/get_email.py
+++ b/helpdesk/management/commands/get_email.py
@@ -260,7 +260,7 @@ def decode_mail_headers(string):
 
 def ticket_from_message(message, queue, logger):
     # 'message' must be an RFC822 formatted message.
-    message = email.message_from_string(message)
+    message = email.message_from_string(message.encode('utf-8'))
     subject = message.get('subject', _('Created from e-mail'))
     subject = decode_mail_headers(decodeUnknown(message.get_charset(), subject))
     for affix in STRIPPED_SUBJECT_STRINGS:

From f16a196c690020ca0f343d985391a2a6157ca862 Mon Sep 17 00:00:00 2001
From: Michael Huang <mikhuang@gmail.com>
Date: Tue, 14 Feb 2017 14:38:48 -0800
Subject: [PATCH 2/3] Fix logout URL

---
 helpdesk/templates/helpdesk/navigation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpdesk/templates/helpdesk/navigation.html b/helpdesk/templates/helpdesk/navigation.html
index 8c6ef395..0121c4fb 100644
--- a/helpdesk/templates/helpdesk/navigation.html
+++ b/helpdesk/templates/helpdesk/navigation.html
@@ -100,7 +100,7 @@
                     {% endif %}
                     {% if helpdesk_settings.HELPDESK_KB_ENABLED %}<li><a href='{% url 'helpdesk:kb_index' %}'>{% trans "Knowledgebase" %}</a></li>{% endif %}
                     {% if not request.path == '/helpdesk/login/' or user.is_authenticated %}
-                        <li>{% if user.is_authenticated %}<a href='{% url 'logout' %}'>{% trans "Logout" %}</a>{% else %}<a href='{% url 'helpdesk:login' %}?next={% if next %}{{ next|escape }}{% else %}{% url 'helpdesk:home' %}{% endif %}'>{% trans "Log In" %}</a>{% endif %}</li>
+                        <li>{% if user.is_authenticated %}<a href='{% url 'helpdesk:logout' %}'>{% trans "Logout" %}</a>{% else %}<a href='{% url 'helpdesk:login' %}?next={% if next %}{{ next|escape }}{% else %}{% url 'helpdesk:home' %}{% endif %}'>{% trans "Log In" %}</a>{% endif %}</li>
                     {% endif %}
                 </ul>
             {% endif %}

From b263b22cca1212f1a4f2f835f0b4cad9630acfd8 Mon Sep 17 00:00:00 2001
From: Michael Huang <mikhuang@gmail.com>
Date: Tue, 14 Feb 2017 14:58:16 -0800
Subject: [PATCH 3/3] Wrap message.encode() in conditional for Python 2

---
 helpdesk/management/commands/get_email.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py
index 26c63a73..c48da611 100644
--- a/helpdesk/management/commands/get_email.py
+++ b/helpdesk/management/commands/get_email.py
@@ -260,7 +260,7 @@ def decode_mail_headers(string):
 
 def ticket_from_message(message, queue, logger):
     # 'message' must be an RFC822 formatted message.
-    message = email.message_from_string(message.encode('utf-8'))
+    message = email.message_from_string(message.encode('utf-8') if six.PY2 else message)
     subject = message.get('subject', _('Created from e-mail'))
     subject = decode_mail_headers(decodeUnknown(message.get_charset(), subject))
     for affix in STRIPPED_SUBJECT_STRINGS: