From 36a5f25c32433e02e0358d0594d1d50c8c1660be Mon Sep 17 00:00:00 2001 From: Jonas Haag Date: Tue, 19 Jan 2016 16:29:23 +0100 Subject: [PATCH 1/4] Silence pip warning --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76653a1..c16602c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,8 @@ matrix: python: '3.5' - env: DJANGO='>=1.7,<1.8' python: '2.6' + - env: DJANGO='>=1.7,<1.8' + python: '3.5' - env: DJANGO='>=1.8,<1.9' python: '2.6' - env: DJANGO='>=1.9,<1.10' @@ -35,7 +37,7 @@ matrix: - env: DJANGO='>=1.9,<1.10' python: '3.4' install: -- pip install -q Django$DJANGO --use-mirrors -- pip install -q -e . --use-mirrors +- pip install -q Django$DJANGO +- pip install -q -e . script: - python setup.py test From 3f68043a65ff9987100954fc2a1e6da4a28db45b Mon Sep 17 00:00:00 2001 From: Jonas Haag Date: Tue, 19 Jan 2016 16:40:07 +0100 Subject: [PATCH 2/4] This should also be supported --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c16602c..9324b39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,8 +34,6 @@ matrix: python: '2.6' - env: DJANGO='>=1.9,<1.10' python: '3.3' - - env: DJANGO='>=1.9,<1.10' - python: '3.4' install: - pip install -q Django$DJANGO - pip install -q -e . From 77b05ca228f96a46c17d61750426a127dde78ab7 Mon Sep 17 00:00:00 2001 From: Jonas Haag Date: Tue, 19 Jan 2016 17:38:29 +0100 Subject: [PATCH 3/4] Debug test_message_reply test failure --- django_mailbox/models.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/django_mailbox/models.py b/django_mailbox/models.py index e9cb9fd..b50b487 100644 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -368,6 +368,7 @@ class Mailbox(models.Model): msg.subject = convert_header_to_unicode(message['subject'])[0:255] if 'message-id' in message: msg.message_id = message['message-id'][0:255] + print("*** DEBUG REPLY *** ", repr(msg.message_id)) if 'from' in message: msg.from_header = convert_header_to_unicode(message['from']) if 'to' in message: @@ -378,6 +379,8 @@ class Mailbox(models.Model): message = self._get_dehydrated_message(message, msg) msg.set_body(message.as_string()) if message['in-reply-to']: + print("*** DEBUG REPLY *** ", repr(message['in-reply-to'])) + print("*** DEBUG REPLY *** ", Message.objects.all().values_list('message_id', flat=1)) try: msg.in_reply_to = Message.objects.filter( message_id=message['in-reply-to'] From bb1f1b26833ba767ece126b43811aa5be5f9719d Mon Sep 17 00:00:00 2001 From: Jonas Haag Date: Tue, 19 Jan 2016 17:49:04 +0100 Subject: [PATCH 4/4] More debugging --- django_mailbox/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/django_mailbox/models.py b/django_mailbox/models.py index b50b487..90af324 100644 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -368,7 +368,7 @@ class Mailbox(models.Model): msg.subject = convert_header_to_unicode(message['subject'])[0:255] if 'message-id' in message: msg.message_id = message['message-id'][0:255] - print("*** DEBUG REPLY *** ", repr(msg.message_id)) + print("*** DEBUG REPLY MESSAGE ID *** ", repr(msg.message_id)) if 'from' in message: msg.from_header = convert_header_to_unicode(message['from']) if 'to' in message: @@ -379,8 +379,8 @@ class Mailbox(models.Model): message = self._get_dehydrated_message(message, msg) msg.set_body(message.as_string()) if message['in-reply-to']: - print("*** DEBUG REPLY *** ", repr(message['in-reply-to'])) - print("*** DEBUG REPLY *** ", Message.objects.all().values_list('message_id', flat=1)) + print("*** DEBUG REPLY IN REPLY TO *** ", repr(message['in-reply-to'])) + print("*** DEBUG REPLY QUERY *** ", Message.objects.all().values_list('message_id', flat=1)) try: msg.in_reply_to = Message.objects.filter( message_id=message['in-reply-to']