holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix get_email from gmail imap

Browse Source
This commit is contained in:
zodman 2017-09-27 12:40:47 -05:00
parent 540531c916
commit 03a57bdc5f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demo/demodesk/config/settings.py
View File

@ -207,3 +207,8 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
# - This is only necessary to make the demo project work, not needed for # - This is only necessary to make the demo project work, not needed for
# your own projects unless you make your own fixtures # your own projects unless you make your own fixtures
FIXTURE_DIRS = [os.path.join(BASE_DIR, 'fixtures')] FIXTURE_DIRS = [os.path.join(BASE_DIR, 'fixtures')]
try:
from .local_settings import *
except ImportError:
pass

5
helpdesk/management/commands/get_email.py
View File

@ -340,13 +340,14 @@ def ticket_from_message(message, queue, logger):
if not name: if not name:
ext = mimetypes.guess_extension(part.get_content_type()) ext = mimetypes.guess_extension(part.get_content_type())
name = "part-%i%s" % (counter, ext) name = "part-%i%s" % (counter, ext)
payload = part.get_payload() payload = part.get_payload()
if isinstance(payload, list):
payload = payload.pop().as_string()
payloadToWrite = payload payloadToWrite = payload
try: try:
logger.debug("Try to base64 decode the attachment payload") logger.debug("Try to base64 decode the attachment payload")
payloadToWrite = base64.decodestring(payload) payloadToWrite = base64.decodestring(payload)
except binascii.Error: except binascii.Error, TypeError:
logger.debug("Payload was not base64 encoded, using raw bytes") logger.debug("Payload was not base64 encoded, using raw bytes")
payloadToWrite = payload payloadToWrite = payload
files.append(SimpleUploadedFile(name, part.get_payload(decode=True), mimetypes.guess_type(name)[0])) files.append(SimpleUploadedFile(name, part.get_payload(decode=True), mimetypes.guess_type(name)[0]))