mirror of
https://github.com/coddingtonbear/django-mailbox.git
synced 2026-07-09 22:38:19 +02:00
Joe
GitHub
commit
e06bd6f2fc
87 changed files with 230 additions and 53245 deletions
2
.flake8
2
.flake8
|
|
@ -1,4 +1,4 @@
|
||||||
[flake8]
|
[flake8]
|
||||||
max-line-length = 200
|
max-line-length = 200
|
||||||
exclude = docs, django_mailbox/migrations, django_mailbox/south_migrations
|
exclude = docs, django_mailbox2/migrations, django_mailbox2/south_migrations
|
||||||
ignore = E231,W503
|
ignore = E231,W503
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
|
|
||||||
[Also based on](https://github.com/conventional-changelog/standard-version/blob/master/CHANGELOG.md) so decending.
|
[Also based on](https://github.com/conventional-changelog/standard-version/blob/master/CHANGELOG.md) so decending.
|
||||||
|
|
||||||
|
## [0.1.3] - 2021-02-08
|
||||||
|
### Added
|
||||||
|
- adds updated module name
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- changes main directory to mailbox2
|
||||||
|
|
||||||
## [0.1.2] - 2021-02-07
|
## [0.1.2] - 2021-02-07
|
||||||
### Added
|
### Added
|
||||||
- adds unique constrain to the message id and a bit of a change on how to create a message
|
- adds unique constrain to the message id and a bit of a change on how to create a message
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
__version__ = "4.8.2"
|
|
||||||
|
|
||||||
default_app_config = "django_mailbox.apps.MailBoxConfig"
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
From nobody Wed Mar 30 12:15:10 2016
|
|
||||||
Delivered-To: info@test.org
|
|
||||||
X-Orig-To: info@test.org
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: multipart/mixed; boundary="----_=_NextPart_001_01D18A74.C17A9D2D"
|
|
||||||
Subject: character issue.
|
|
||||||
Date: Wed, 30 Mar 2016 08:10:23 -0300
|
|
||||||
Message-ID: <2A4988FCD265FE438FD0848B3ED91ABA2C0AAF3E@issue>
|
|
||||||
From: "Me" <me@test.org>
|
|
||||||
To: <info@test.org>
|
|
||||||
|
|
||||||
This is a multi-part message in MIME format.
|
|
||||||
|
|
||||||
------_=_NextPart_001_01D18A74.C17A9D2D
|
|
||||||
Content-Type: multipart/alternative;
|
|
||||||
boundary="----_=_NextPart_002_01D18A74.C17A9D2D"
|
|
||||||
|
|
||||||
|
|
||||||
------_=_NextPart_002_01D18A74.C17A9D2D
|
|
||||||
Content-Type: text/plain;
|
|
||||||
charset="utf-8"
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
|
|
||||||
|
|
||||||
QXRlbmNpw7NuIGFsdXN0b21lciBTZXJ2aWNlIEYW9ubGluZQ0KCVIA0KCURJ
|
|
||||||
aWxlZ2lhZGFzIChwcm90ZWdpZGFzIHBvciBzaWdpbG8gcHJvZmlzc2lvbmFs
|
|
||||||
IGNvbnRyYXR1YWwsIHBvciBsZWkgZGUKcHJvcHJpZWRhZGUgaW50ZWxlY3R1
|
|
||||||
YWwvaW5kdXN0cmlhbCBvdSBjdWphIGRpdnVsZ2Hn428gc2VqYSBwcm9pYmlk
|
|
||||||
YSBwb3Igc2V1IHByb3ByaWV04XJpbykgcXVlIHPjbyBkZSBpbnRlcmVzc2Ug
|
|
||||||
ZXhjbHVzaXZvIGRlIHNldShzKSByZW1ldGVudGUocykgZQpkZXN0aW5hdOFy
|
|
||||||
aW8ocykuIENhc28gbuNvIGVzdGVqYSBlbnZvbHZpZG8gbm8gcHJvY2Vzc28g
|
|
||||||
ZG8gcXVhbCB0cmF0YSBlc3RhIG1lbnNhZ2VtIGUvb3UgcmVjZWJldS1hIHBv
|
|
||||||
ciBlbmdhbm8sIHBvciBmYXZvciwgZXhjbHVhLWEgZGEgc3VhIGNhaXhhIHBv
|
|
||||||
c3RhbCBlCmNvbXVuaXF1ZSBvIG9jb3JyaWRvIGFvIHNldSBwcm9wcmlldOFy
|
|
||||||
aW8uIE8gdXNvLCByZXZlbGHn428sIGRpc3RyaWJ1aefjbyxpbXByZXNz428g
|
|
||||||
b3UgY/NwaWEgZGUgdG9kYSBvdSBhbGd1bWEgcGFydGUgZGFzIGluZm9ybWHn
|
|
||||||
9WVzLCBzZW0gcHLpdmlhCmF1dG9yaXph5+NvLCBlc3ThIHN1amVpdG8g4HMg
|
|
||||||
cGVuYWxpZGFkZXMgY2Fi7XZlaXMuIEFzIGluZm9ybWHn9WVzIGFxdWkgY29u
|
|
||||||
dGlkYXMgbuNvIG5lY2Vzc2FyaWFtZW50ZSByZWZsZXRlbSBhIG9waW5p428g
|
|
||||||
ZGEgTUVUQUdBTCBJTkQuIENPTS4gTFREQS4sCmZpY2FuZG8gbyByZW1ldGVu
|
|
||||||
dGUgaW50ZWlyYW1lbnRlIHJlc3BvbnPhdmVsIHBlbG8gc2V1IGNvbnRl+mRv
|
|
||||||
LiAKCg==
|
|
||||||
|
|
||||||
------_=_NextPart_002_01D18A74.C17A9D2D--
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
MIME-Version: 1.0
|
|
||||||
X-Originating-IP: [24.22.122.177]
|
|
||||||
Date: Sun, 20 Jan 2013 11:53:53 -0800
|
|
||||||
Delivered-To: test@adamcoddington.net
|
|
||||||
Message-ID: <CAMdmm+hGH8Dgn-_0xnXJCd=PhyNAiouOYm5zFP0z-foqTO60zA@mail.gmail.com>
|
|
||||||
Subject: Message Without Attachment
|
|
||||||
From: Adam Coddington <test@adamcoddington.net>
|
|
||||||
To: Adam Coddington <test@adamcoddington.net>
|
|
||||||
Content-Type: text/plain; charset="iso-8859-1"
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
|
|
||||||
Hello there.
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
MIME-Version: 1.0
|
|
||||||
Received: by 10.221.0.211 with HTTP; Sun, 20 Jan 2013 12:07:07 -0800 (PST)
|
|
||||||
X-Originating-IP: [24.22.122.177]
|
|
||||||
Date: Sun, 20 Jan 2013 12:07:07 -0800
|
|
||||||
Delivered-To: test@adamcoddington.net
|
|
||||||
Message-ID: <CAMdmm+jYCgrxrekAxszmDnBjAytcBym-Ec+uM-+HEtzuKy=M_g@mail.gmail.com>
|
|
||||||
Subject: Message With Attachment
|
|
||||||
From: Adam Coddington <test@adamcoddington.net>
|
|
||||||
To: Adam Coddington <test@adamcoddington.net>
|
|
||||||
Content-Type: multipart/mixed; boundary=047d7b33dd729737fe04d3bde348
|
|
||||||
|
|
||||||
--047d7b33dd729737fe04d3bde348
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
|
|
||||||
This message has an attachment.
|
|
||||||
|
|
||||||
--047d7b33dd729737fe04d3bde348
|
|
||||||
Content-Type: image/png; name="heart.png"
|
|
||||||
Content-Disposition: attachment; filename="heart.png"
|
|
||||||
X-Attachment-Id: f_hc6mair60
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
|
|
||||||
iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAFoTx1HAAAAzUlEQVQoz32RWxXDIBBEr4NIQEIl
|
|
||||||
ICESkFAJkRAJSIgEpEQCEqYfu6QUkn7sCcyDGQiSACKSKCAkGwBJwhDwZQNMEiYAIBdQvk7rfaHf
|
|
||||||
AO8NBJwCxTGhtFgTHVNaNaJeWFu44AXEHzKCktc7zZ0vss+bMoHSiM2b9mQoX1eZCgGqnWskY3gi
|
|
||||||
XXAAxb8BqFiUgBNY7k49Tu/kV7UKPsefrjEOT9GmghYzrk9V03pjDGYKj3d0c06dKZkpTboRaD9o
|
|
||||||
B+1m2m81d2Az948xzgdjLaFe95e83AAAAABJRU5ErkJggg==
|
|
||||||
|
|
||||||
--047d7b33dd729737fe04d3bde348--
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
X-sender: <sender@sendersdomain.com>
|
|
||||||
X-receiver: <somerecipient@recipientdomain.com>
|
|
||||||
From: "Senders Name" <sender@sendersdomain.com>
|
|
||||||
To: "Recipient Name" <somerecipient@recipientdomain.com>
|
|
||||||
Message-ID: <5bec11c119194c14999e592feb46e3cf@sendersdomain.com>
|
|
||||||
Date: Sat, 24 Sep 2005 15:06:49 -0400
|
|
||||||
Subject: Sample Multi-Part
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: multipart/alternative; boundary="----=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D"
|
|
||||||
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D
|
|
||||||
Content-type: text/plain; charset=iso-8859-1
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Sample Text Content
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D
|
|
||||||
Content-Type: multipart/alternative; boundary="----=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C"
|
|
||||||
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C
|
|
||||||
Content-Type: text/plain; charset=iso-8859-1
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Multipart inside of multipart!
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C
|
|
||||||
X-Django-Mailbox-Interpolate-Attachment: 9013
|
|
||||||
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C--
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D--
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
X-sender: <sender@sendersdomain.com>
|
|
||||||
X-receiver: <somerecipient@recipientdomain.com>
|
|
||||||
From: "Senders Name" <sender@sendersdomain.com>
|
|
||||||
To: "Recipient Name" <somerecipient@recipientdomain.com>
|
|
||||||
Message-ID: <5bec11c119194c14999e592feb46e3cf@sendersdomain.com>
|
|
||||||
Date: Sat, 24 Sep 2005 15:06:49 -0400
|
|
||||||
Subject: Sample Multi-Part
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: multipart/alternative; boundary="----=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D"
|
|
||||||
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D
|
|
||||||
Content-type: text/plain; charset=iso-8859-1
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Sample Text Content
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D
|
|
||||||
Content-Type: multipart/alternative; boundary="----=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C"
|
|
||||||
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C
|
|
||||||
Content-Type: text/plain; charset=iso-8859-1
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Multipart inside of multipart!
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C
|
|
||||||
X-Django-Mailbox-Altered-Message: Missing; Attachment 9013 not found
|
|
||||||
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C--
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D--
|
|
||||||
|
|
@ -1,106 +0,0 @@
|
||||||
Delivered-To: person3@example.com
|
|
||||||
Received: by 10.76.18.165 with SMTP id x5csp92235oad;
|
|
||||||
Thu, 31 Jan 2013 10:00:48 -0800 (PST)
|
|
||||||
X-Received: by 10.66.81.231 with SMTP id d7mr22593565pay.27.1359655248387;
|
|
||||||
Thu, 31 Jan 2013 10:00:48 -0800 (PST)
|
|
||||||
Return-Path: <SRS0=RahL=LY=example.net=person2@bounce.secureserver.net>
|
|
||||||
Received: from p3plsmtp21-02.prod.phx3.secureserver.net (p3plsmtp21-02.prod.phx3.secureserver.net. [123.123.123.123])
|
|
||||||
by mx.google.com with ESMTP id wk7si5300126pbc.79.2013.01.31.10.00.47;
|
|
||||||
Thu, 31 Jan 2013 10:00:48 -0800 (PST)
|
|
||||||
Received-SPF: pass (google.com: domain of SRS0=RahL=LY=example.net=person2@bounce.secureserver.net designates 123.123.123.123 as permitted sender) client-ip=123.123.123.123;
|
|
||||||
Authentication-Results: mx.google.com;
|
|
||||||
spf=pass (google.com: domain of SRS0=RahL=LY=example.net=person2@bounce.secureserver.net designates 123.123.123.123 as permitted sender) smtp.mail=SRS0=RahL=LY=example.net=person2@bounce.secureserver.net
|
|
||||||
Received: (qmail 23678 invoked from network); 31 Jan 2013 18:00:47 -0000
|
|
||||||
Delivered-To: person4@example.com
|
|
||||||
Precedence: bulk
|
|
||||||
Received: (qmail 23676 invoked by uid 30297); 31 Jan 2013 18:00:47 -0000
|
|
||||||
Received: from unknown (HELO p3pismtp01-017.prod.phx3.secureserver.net) ([123.123.123.123])
|
|
||||||
(envelope-sender <person1@example.com>)
|
|
||||||
by p3plsmtp21-02.prod.phx3.secureserver.net (qmail-1.03) with SMTP
|
|
||||||
for <person4@example.com>; 31 Jan 2013 18:00:47 -0000
|
|
||||||
X-IronPort-Anti-Spam-Result: AjsDACKwClFIFIAKnGdsb2JhbABCA4JJg3+BJKR7iSQBiCaBCA4BAQEBAQgLCQkUJ4IeAQEEAR4FQSUFBhEDAQIGAQEBIgICAhUIBykIFQMBAYgKBgyvRyuSOI0RED2CG4ETA4hkgnKBaYJxhWKBHIVAjQqBRwIDBBc
|
|
||||||
Received: from mail.example.net (HELO example.com) ([72.20.128.10])
|
|
||||||
by p3pismtp01-017.prod.phx3.secureserver.net with ESMTP; 31 Jan 2013 11:00:28 -0700
|
|
||||||
Received: from DOM-ADM-MTA by aa03.example.net
|
|
||||||
with Novell_GroupWise; Thu, 31 Jan 2013 12:00:24 -0600
|
|
||||||
Mime-Version: 1.0
|
|
||||||
Date: Thu, 31 Jan 2013 12:00:08 -0600
|
|
||||||
References: <1359492484.4590710694371947@mf102>
|
|
||||||
In-Reply-To: <1359492484.4590710694371947@mf102>
|
|
||||||
Message-ID: <510A5CC8.6E86.00A9.1@example.net>
|
|
||||||
X-Priority: 1
|
|
||||||
X-Mailer: Groupwise 7.0.3
|
|
||||||
From: "Person" <person1@example.com>
|
|
||||||
Subject: Re: Fwd: Stuff
|
|
||||||
To: person4@example.com
|
|
||||||
Content-Type: multipart/alternative; boundary="____SRNGMVRNJTDKENWSQEFF____"
|
|
||||||
|
|
||||||
|
|
||||||
--____SRNGMVRNJTDKENWSQEFF____
|
|
||||||
Content-Type: text/plain; charset=utf-8
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
Content-Disposition: inline; modification-date="Fri, 31 Jan 2013 06:00:09
|
|
||||||
-0600"
|
|
||||||
|
|
||||||
SGVsbG8sIFdvcmxk
|
|
||||||
--____SRNGMVRNJTDKENWSQEFF____
|
|
||||||
Content-Type: multipart/related; boundary="____AVETMQDQOMFFURFTDWUU____"
|
|
||||||
|
|
||||||
|
|
||||||
--____AVETMQDQOMFFURFTDWUU____
|
|
||||||
Content-Type: text/html; charset=utf-8
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
Content-Disposition: inline; modification-date="Fri, 31 Jan 2013 06:00:09
|
|
||||||
-0600"
|
|
||||||
|
|
||||||
PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIN
|
|
||||||
CiAgICAgICAgImh0dHA6Ly93d3cudzMub3JnL1RSL3hodG1sMS9EVEQveGh0bWwxLXN0cmljdC5k
|
|
||||||
dGQiPg0KPGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPg0KDQo8aGVh
|
|
||||||
ZD4NCgk8dGl0bGU+QW4gWEhUTUwgMS4wIFN0cmljdCBzdGFuZGFyZCB0ZW1wbGF0ZTwvdGl0bGU+
|
|
||||||
DQoJPG1ldGEgaHR0cC1lcXVpdj0iY29udGVudC10eXBlIiANCgkJY29udGVudD0idGV4dC9odG1s
|
|
||||||
O2NoYXJzZXQ9dXRmLTgiIC8+DQo8L2hlYWQ+DQoNCjxib2R5Pg0KDQogICAgIDxpbWcgc3JjPSJj
|
|
||||||
aWQ6Uk1YUExSSUhXUlFLLjMuanBnIj4NCiAgICAgPHA+SGVsbG8sIHdvcmxkPC9wPg0KICAgICA8
|
|
||||||
aW1nIHNyYz0iY2lkOk9FT1lLRUpFTkxJSy4yLmpwZyI+DQoNCjwvYm9keT4NCjwvaHRtbD4=
|
|
||||||
--____AVETMQDQOMFFURFTDWUU____
|
|
||||||
Content-ID: <OEOYKEJENLIK.2.jpg>
|
|
||||||
Content-Type: image/jpg
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
|
|
||||||
/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAkGBwgHBgkIBwgKCgkLDRYPDQwMDRsUFRAWIB0iIiAd
|
|
||||||
Hx8kKDQsJCYxJx8fLT0tMTU3Ojo6Iys/RD84QzQ5Ojf/2wBDAQoKCg0MDRoPDxo3JR8lNzc3Nzc3
|
|
||||||
Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzf/wAARCAApABYDASIA
|
|
||||||
AhEBAxEB/8QAGAAAAwEBAAAAAAAAAAAAAAAAAAYHCAT/xAAvEAABAwMDAwEFCQAAAAAAAAABAgME
|
|
||||||
AAURBhIhBzFBswgTFSRSGCIyNlF1o9Hx/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAA
|
|
||||||
AAAAAAAAAAAAAAD/2gAMAwEAAhEDEQA/AH7qnb9V3GwIa0dKLMgOgvIad9064nxscJATg8nkZHnw
|
|
||||||
ZMjSvWXen5q8Dnub0kj1a0ZRQKuhtVwr2y5bVXWPPu8BIRLcYRsQ6cDK0fUnJxkcZHYAiio37OP5
|
|
||||||
4nftbnqtUUFO6namvcSKuBolTUm7slK5bTKQ6+y0rsUt4O7J79yAQccgiZo1X1l3p+VvB57GypA9
|
|
||||||
KjRqlfaGk/ePNzuAPPja9/VaMoFHQWj4NgaXcza2IN2noBlNsub0MnglDf0pyM4GeeMkAUU3UUEZ
|
|
||||||
6gWVnp9entdWWC7MmSHlHa9ksRHF53uKwQo7txAHYEnn8IpZR151UVpHw6zqyewZdyf5K0ZRQcVl
|
|
||||||
mPXG0xJkqE7BeeaC1xniCpsnwcf7+oB4ortooP/Z
|
|
||||||
--____AVETMQDQOMFFURFTDWUU____
|
|
||||||
Content-ID: <RMXPLRIHWRQK.3.jpg>
|
|
||||||
Content-Type: image/jpg
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
|
|
||||||
/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBwgHBgkTBwgKCgkLDRYPDQwMDRsUFRAWIB0iIiAd
|
|
||||||
Hx8kKDQsJCYxJx8fLT0tMTU3Ojo6Iys/RD8uQzQ5OjcBCgoKBQUFDgUFDisZExkrKysrKysrKysr
|
|
||||||
KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrK//AABEIACkAFgMBIgACEQED
|
|
||||||
EQH/xAAYAAEBAQEBAAAAAAAAAAAAAAAHAAgGAf/EACoQAAECBAYABQUAAAAAAAAAAAECAwAEBREG
|
|
||||||
BxIhMUEIEyRSsyU2UXWj/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAAAAAAAAAAAAAA
|
|
||||||
AAD/2gAMAwEAAhEDEQA/AO+zTp+K6jQEJwdNFmYDoLyG3fKdcT1pcJGmx3O4uO+iTIwrnLrT6qsD
|
|
||||||
fk1pJHyxoyKA5XA2K5KtsuS6qrLz9WkEhE2thGhDp2utHuTfa47HABEUDfhx+9579W58rUewC1mn
|
|
||||||
UMV06gIVg6VL0wXQHltNea62nrS2QdVzsdjYddgmRirOTWn0tYO/BoqQPijRkUBwmWlFoMi5PuSU
|
|
||||||
vJsV1RSipMSz3mJlVkAltHtTfewuLgi507UF3hyUo43n7qJvTHCbnk+a1HkAtZp4tqWD6Ah6l00T
|
|
||||||
a1uhCnXAS0wPyoAg78DgX74BJkZ84qK0/TqOq54DLtz/AEjRkUAf5Y4Fp2H1OzrEtNys1UGQEycy
|
|
||||||
oEyjZsot7c7gG53sACAb3oQIoD//2Q==
|
|
||||||
--____AVETMQDQOMFFURFTDWUU____
|
|
||||||
Content-ID: <OSSFDHZYGOQM.transparent.gif>
|
|
||||||
Content-Type: image/gif
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
|
|
||||||
R0lGODlhAQABAPAAAAAAAP///yH5BAEAAAEALAAAAAABAAEAAAICTAEAOw==
|
|
||||||
--____AVETMQDQOMFFURFTDWUU____--
|
|
||||||
|
|
||||||
--____SRNGMVRNJTDKENWSQEFF____--
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
Date: Fri, 30 Jan 2012 11:30:01 PST
|
|
||||||
Subject: Tjest Wrong
|
|
||||||
From: "Somebody" <somebody@somewhere.com>
|
|
||||||
To: idontknow@somewhere.com
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset="us-ascii"
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
|
|
||||||
Ýòî ñîîáùåíèå èìååò íåïðàâèëüíóþ êîäèðîâêà.
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
Reply-To: <private00@qq.com>
|
|
||||||
From: "Refinance"<finance@khas.edu.tr>
|
|
||||||
Subject: Apply For Loans @ 2% Per Annum
|
|
||||||
Date: Sun, 19 Oct 2014 11:48:49 +0100
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain;
|
|
||||||
charset="_iso-2022-jp$ESC"
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
|
|
||||||
We offer loans to private individuals and corporate organizations at 2% interest rate. Interested serious applicants should apply via email with details of their requirements.
|
|
||||||
|
|
||||||
Warm Regards,
|
|
||||||
Loan Team
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,321 +0,0 @@
|
||||||
Delivered-To: inbox+e1610728c9a39d45a39f6de9d3e7882d@appfluence.com
|
|
||||||
Received: by 10.202.65.3 with SMTP id o3csp2439694oia;
|
|
||||||
Mon, 1 Aug 2016 07:14:31 -0700 (PDT)
|
|
||||||
X-Received: by 10.55.174.2 with SMTP id x2mr24289941qke.176.1470060871862;
|
|
||||||
Mon, 01 Aug 2016 07:14:31 -0700 (PDT)
|
|
||||||
Return-Path: <samuel@appfluence.com>
|
|
||||||
Received: from mail-qk0-x231.google.com (mail-qk0-x231.google.com.
|
|
||||||
[2607:f8b0:400d:c09::231])
|
|
||||||
by mx.google.com with ESMTPS id z24si20091602qtb.68.2016.08.01.07.14.31
|
|
||||||
for <inbox+e1610728c9a39d45a39f6de9d3e7882d@appfluence.com>
|
|
||||||
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
|
|
||||||
Mon, 01 Aug 2016 07:14:31 -0700 (PDT)
|
|
||||||
Received-SPF: fail (google.com: domain of samuel@appfluence.com does not
|
|
||||||
designate 2607:f8b0:400d:c09::231 as permitted sender)
|
|
||||||
client-ip=2607:f8b0:400d:c09::231;
|
|
||||||
Authentication-Results: mx.google.com;
|
|
||||||
dkim=pass (test mode) header.i=@appfluence.com;
|
|
||||||
spf=fail (google.com: domain of samuel@appfluence.com does not designate
|
|
||||||
2607:f8b0:400d:c09::231 as permitted sender)
|
|
||||||
smtp.mailfrom=samuel@appfluence.com
|
|
||||||
Received: by mail-qk0-x231.google.com with SMTP id s63so146544737qkb.2
|
|
||||||
for <inbox+e1610728c9a39d45a39f6de9d3e7882d@appfluence.com>;
|
|
||||||
Mon, 01 Aug 2016 07:14:31 -0700 (PDT)
|
|
||||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
||||||
d=appfluence.com; s=google;
|
|
||||||
h=mime-version:in-reply-to:references:from:date:message-id:subject:to;
|
|
||||||
bh=BdDzvT6vMuB8ml9Gj8Rpu5N56mm+mxDWmJj1C2qj1DI=;
|
|
||||||
b=S3tMqWmjc/j5VI+G+OP0ZifdNuUhr0Oa7+vP+CM799JAVpLj2AHhxqAehiK4chdEBJ
|
|
||||||
mqCjTDr8HD94+5sRPkXXITnG4e+Qbf+Ev2j7uSva3tzWqwstE16Dgk+5P90zD13Jcw2Z
|
|
||||||
iR95lJM4P4pjAYPdvI+xIZJzUATYsFeGiLKCk=
|
|
||||||
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
||||||
d=1e100.net; s=20130820;
|
|
||||||
h=x-gm-message-state:mime-version:in-reply-to:references:from:date
|
|
||||||
:message-id:subject:to;
|
|
||||||
bh=BdDzvT6vMuB8ml9Gj8Rpu5N56mm+mxDWmJj1C2qj1DI=;
|
|
||||||
b=H6WI5oNvUGYkwJYteWNZRQpbUZlsb93j7WHHuwMfC1LhTdJhVD8cdARx8BY9hfqqxh
|
|
||||||
h8ENaNeUEUWvXZIQfqnZLZSBcB2i/7ma30MSRvQjr7fK64HG5as8YzypLHcoMX0tTy6M
|
|
||||||
KTwejbdeL6Q+kj8LicwlBtW56P6/pNE2JAh+Tz2Jwk0lf8J+I+JAhzYw6Rcl4ePqlsaY
|
|
||||||
+wEq+nw4L9JCSzcRuoTOXJ4XGuIUl88zqs3gD44fipFBbvksSvv9bcVklv7Zl70H8l49
|
|
||||||
QFV5gso7Gd/ucv7GmdoII6P4nreumLzsbp8X2E1ITfmbpRj6ZNVfYCm4GJkNmPnIr92z
|
|
||||||
wTSA==
|
|
||||||
X-Gm-Message-State: AEkoouvaSnp95p/T1DJAbPeVKXqVUqN0vg8BJ2EGw9PYnyjFbr8scKge3m0yhdFoBpzeJvmDsIC7fHtZI7+kYg==
|
|
||||||
X-Received: by 10.55.212.218 with SMTP id s87mr21265928qks.10.1470060870080;
|
|
||||||
Mon, 01 Aug 2016 07:14:30 -0700 (PDT)
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Received: by 10.55.214.148 with HTTP; Mon, 1 Aug 2016 07:14:29 -0700 (PDT)
|
|
||||||
X-Originating-IP: [217.216.81.186]
|
|
||||||
In-Reply-To: <CAAqFzoA1U_QrzJ7X12SpE-AteNpjd6ad6x-mJh847_gtQM8kSw@mail.gmail.com>
|
|
||||||
References: <CAAqFzoA1U_QrzJ7X12SpE-AteNpjd6ad6x-mJh847_gtQM8kSw@mail.gmail.com>
|
|
||||||
From: Samuel Carmona <samuel@appfluence.com>
|
|
||||||
Date: Mon, 1 Aug 2016 16:14:29 +0200
|
|
||||||
Message-ID: <CAAqFzoDNo1JC+wBmAd=xh1DRv+EUPaNJBS+mc3wKehK9jiSpfw@mail.gmail.com>
|
|
||||||
Subject: Fwd: Test
|
|
||||||
To: inbox+e1610728c9a39d45a39f6de9d3e7882d@appfluence.com
|
|
||||||
Content-Type: multipart/alternative; boundary=001a11479a7cf5bcb6053903371b
|
|
||||||
|
|
||||||
--001a11479a7cf5bcb6053903371b
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
|
|
||||||
Geralt takes up a contract sent out by Olgierd von Everec, who tasks him
|
|
||||||
with eliminating a giant toad monster in the sewers of Oxenfurt. While
|
|
||||||
hunting the monster, Geralt runs into Shani, a Redanian medic and an old
|
|
||||||
acquaintance of his, whom he has the option of romancing. Geralt then kills
|
|
||||||
the toad monster, only to find it was actually a cursed Ofieri prince. The
|
|
||||||
prince's guards capture Geralt with the intention of executing him. While
|
|
||||||
awaiting his execution en route to Ofier, Geralt is approached by the
|
|
||||||
mysterious Gaunter O'Dimm. O'Dimm helps Geralt escape, but in return Geralt
|
|
||||||
must help O'Dimm recover a debt from von Everec, who had set up Geralt
|
|
||||||
knowing the toad monster was an Ofieri prince. O'Dimm tells Geralt that
|
|
||||||
according to terms of his contract with von Everec, he must fulfill three
|
|
||||||
of von Everec's wishes. Geralt confronts von Everec and discovers that von
|
|
||||||
Everec had obtained immortality at the cost of his emotions, giving him a
|
|
||||||
"Heart of Stone". He admits to cursing the Ofieri prince since he was
|
|
||||||
arranged to marry his true love Iris, and that he wished for immortality in
|
|
||||||
order to be with her. He then tells Geralt his three wishes: to entertain
|
|
||||||
his brother Vlodomir for one night, to get revenge on the Borsodi family by
|
|
||||||
obtaining Maximillian Borsodi's house, and to obtain the violet rose he had
|
|
||||||
given to Iris. O'Dimm tells Geralt that the three tasks are meant to be
|
|
||||||
impossible, as Maximillian Borsodi's house is kept in a highly secure vault
|
|
||||||
and both Vlodomir and Iris have been dead for years, but he agrees to
|
|
||||||
assist Geralt.
|
|
||||||
|
|
||||||
With O'Dimm's help, Geralt allows Vlodimir's spirit to possess his body for
|
|
||||||
one night, allowing him to attend a wedding party and fulfilling the first
|
|
||||||
wish. Geralt then participates in a heist to steal Maximillian Borsodi's
|
|
||||||
house from its vault, and finds that it contains a will that would grant
|
|
||||||
the entire Borsodi fortune to charity, fulfilling von Everec's revenge and
|
|
||||||
second wish. To obtain Iris' rose, Geralt enlists the help of demonic
|
|
||||||
entities to gain access to a supernatural realm where he witnesses von
|
|
||||||
Everec and Iris' past. There, he learns that due to his "Heart of Stone",
|
|
||||||
von Everec could not truly love Iris and she died neglected and unhappy.
|
|
||||||
Geralt, on player's choice can either obtain the rose from Iris' spirit in
|
|
||||||
order to free her from "pinned" into the world or let the rose be with her.
|
|
||||||
Either way, Geralt fulfills von Everec's last wish and goes to meet with
|
|
||||||
him. Along the way, he learns that O'Dimm is in fact an ancient entity of
|
|
||||||
pure evil that thrives off tricking people into trading away their souls in
|
|
||||||
return for wishes. When Geralt meets with von Everec, the three wishes are
|
|
||||||
fulfilled and O'Dimm arrives to collect von Everec's soul.
|
|
||||||
|
|
||||||
At this point, Geralt has the option of allowing O'Dimm to take von
|
|
||||||
Everec's soul or intervening to save von Everec. If Geralt does nothing,
|
|
||||||
O'Dimm kills von Everec, takes his soul, and rewards Geralt with one wish.
|
|
||||||
If Geralt intervenes, he challenges O'Dimm by wagering his own soul to save
|
|
||||||
von Everec. After Geralt solves O'Dimm's riddle, O'Dimm is forced to
|
|
||||||
release both Geralt and von Everec from their pacts. von Everec, now mortal
|
|
||||||
again, regains his emotions and immediately feels regret for his past
|
|
||||||
actions and mistakes. He gives Geralt his family sword, and promises to
|
|
||||||
start a new life free from O'Dimm's control.
|
|
||||||
|
|
||||||
|
|
||||||
11111111111111111
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Geralt takes up a contract sent out by Olgierd von Everec, who tasks him
|
|
||||||
with eliminating a giant toad monster in the sewers of Oxenfurt. While
|
|
||||||
hunting the monster, Geralt runs into Shani, a Redanian medic and an old
|
|
||||||
acquaintance of his, whom he has the option of romancing. Geralt then kills
|
|
||||||
the toad monster, only to find it was actually a cursed Ofieri prince. The
|
|
||||||
prince's guards capture Geralt with the intention of executing him. While
|
|
||||||
awaiting his execution en route to Ofier, Geralt is approached by the
|
|
||||||
mysterious Gaunter O'Dimm. O'Dimm helps Geralt escape, but in return Geralt
|
|
||||||
must help O'Dimm recover a debt from von Everec, who had set up Geralt
|
|
||||||
knowing the toad monster was an Ofieri prince. O'Dimm tells Geralt that
|
|
||||||
according to terms of his contract with von Everec, he must fulfill three
|
|
||||||
of von Everec's wishes. Geralt confronts von Everec and discovers that von
|
|
||||||
Everec had obtained immortality at the cost of his emotions, giving him a
|
|
||||||
"Heart of Stone". He admits to cursing the Ofieri prince since he was
|
|
||||||
arranged to marry his true love Iris, and that he wished for immortality in
|
|
||||||
order to be with her. He then tells Geralt his three wishes: to entertain
|
|
||||||
his brother Vlodomir for one night, to get revenge on the Borsodi family by
|
|
||||||
obtaining Maximillian Borsodi's house, and to obtain the violet rose he had
|
|
||||||
given to Iris. O'Dimm tells Geralt that the three tasks are meant to be
|
|
||||||
impossible, as Maximillian Borsodi's house is kept in a highly secure vault
|
|
||||||
and both Vlodomir and Iris have been dead for years, but he agrees to
|
|
||||||
assist Geralt.
|
|
||||||
|
|
||||||
With O'Dimm's help, Geralt allows Vlodimir's spirit to possess his body for
|
|
||||||
one night, allowing him to attend a wedding party and fulfilling the first
|
|
||||||
wish. Geralt then participates in a heist to steal Maximillian Borsodi's
|
|
||||||
house from its vault, and finds that it contains a will that would grant
|
|
||||||
the entire Borsodi fortune to charity, fulfilling von Everec's revenge and
|
|
||||||
second wish. To obtain Iris' rose, Geralt enlists the help of demonic
|
|
||||||
entities to gain access to a supernatural realm where he witnesses von
|
|
||||||
Everec and Iris' past. There, he learns that due to his "Heart of Stone",
|
|
||||||
von Everec could not truly love Iris and she died neglected and unhappy.
|
|
||||||
Geralt, on player's choice can either obtain the rose from Iris' spirit in
|
|
||||||
order to free her from "pinned" into the world or let the rose be with her.
|
|
||||||
Either way, Geralt fulfills von Everec's last wish and goes to meet with
|
|
||||||
him. Along the way, he learns that O'Dimm is in fact an ancient entity of
|
|
||||||
pure evil that thrives off tricking people into trading away their souls in
|
|
||||||
return for wishes. When Geralt meets with von Everec, the three wishes are
|
|
||||||
fulfilled and O'Dimm arrives to collect von Everec's soul.
|
|
||||||
|
|
||||||
At this point, Geralt has the option of allowing O'Dimm to take von
|
|
||||||
Everec's soul or intervening to save von Everec. If Geralt does nothing,
|
|
||||||
O'Dimm kills von Everec, takes his soul, and rewards Geralt with one wish.
|
|
||||||
If Geralt intervenes, he challenges O'Dimm by wagering his own soul to save
|
|
||||||
von Everec. After Geralt solves O'Dimm's riddle, O'Dimm is forced to
|
|
||||||
release both Geralt and von Everec from their pacts. von Everec, now mortal
|
|
||||||
again, regains his emotions and immediately feels regret for his past
|
|
||||||
actions and mistakes. He gives Geralt his family sword, and promises to
|
|
||||||
start a new life free from O'Dimm's control.
|
|
||||||
|
|
||||||
2222222222222222222
|
|
||||||
|
|
||||||
|
|
||||||
Geralt takes up a contract sent out by Olgierd von Everec, who tasks him
|
|
||||||
with eliminating a giant toad monster in the sewers of Oxenfurt. While
|
|
||||||
hunting the monster, Geralt runs into Shani, a Redanian medic and an old
|
|
||||||
acquaintance of his, whom he has the option of romancing. Geralt then kills
|
|
||||||
the toad monster, only to find it was actually a cursed Ofieri prince. The
|
|
||||||
prince's guards capture Geralt with the intention of executing him. While
|
|
||||||
awaiting his execution en route to Ofier, Geralt is approached by the
|
|
||||||
mysterious Gaunter O'Dimm. O'Dimm helps Geralt escape, but in return Geralt
|
|
||||||
must help O'Dimm recover a debt from von Everec, who had set up Geralt
|
|
||||||
knowing the toad monster was an Ofieri prince. O'Dimm tells Geralt that
|
|
||||||
according to terms of his contract with von Everec, he must fulfill three
|
|
||||||
of von Everec's wishes. Geralt confronts von Everec and discovers that von
|
|
||||||
Everec had obtained immortality at the cost of his emotions, giving him a
|
|
||||||
"Heart of Stone". He admits to cursing the Ofieri prince since he was
|
|
||||||
arranged to marry his true love Iris, and that he wished for immortality in
|
|
||||||
order to be with her. He then tells Geralt his three wishes: to entertain
|
|
||||||
his brother Vlodomir for one night, to get revenge on the Borsodi family by
|
|
||||||
obtaining Maximillian Borsodi's house, and to obtain the violet rose he had
|
|
||||||
given to Iris. O'Dimm tells Geralt that the three tasks are meant to be
|
|
||||||
impossible, as Maximillian Borsodi's house is kept in a highly secure vault
|
|
||||||
and both Vlodomir and Iris have been dead for years, but he agrees to
|
|
||||||
assist Geralt.
|
|
||||||
|
|
||||||
With O'Dimm's help, Geralt allows Vlodimir's spirit to possess his body for
|
|
||||||
one night, allowing him to attend a wedding party and fulfilling the first
|
|
||||||
wish. Geralt then participates in a heist to steal Maximillian Borsodi's
|
|
||||||
house from its vault, and finds that it contains a will that would grant
|
|
||||||
the entire Borsodi fortune to charity, fulfilling von Everec's revenge and
|
|
||||||
second wish. To obtain Iris' rose, Geralt enlists the help of demonic
|
|
||||||
entities to gain access to a supernatural realm where he witnesses von
|
|
||||||
Everec and Iris' past. There, he learns that due to his "Heart of Stone",
|
|
||||||
von Everec could not truly love Iris and she died neglected and unhappy.
|
|
||||||
Geralt, on player's choice can either obtain the rose from Iris' spirit in
|
|
||||||
order to free her from "pinned" into the world or let the rose be with her.
|
|
||||||
Either way, Geralt fulfills von Everec's last wish and goes to meet with
|
|
||||||
him. Along the way, he learns that O'Dimm is in fact an ancient entity of
|
|
||||||
pure evil that thrives off tricking people into trading away their souls in
|
|
||||||
return for wishes. When Geralt meets with von Everec, the three wishes are
|
|
||||||
fulfilled and O'Dimm arrives to collect von Everec's soul.
|
|
||||||
|
|
||||||
At this point, Geralt has the option of allowing O'Dimm to take von
|
|
||||||
Everec's soul or intervening to save von Everec. If Geralt does nothing,
|
|
||||||
O'Dimm kills von Everec, takes his soul, and rewards Geralt with one wish.
|
|
||||||
If Geralt intervenes, he challenges O'Dimm by wagering his own soul to save
|
|
||||||
von Everec. After Geralt solves O'Dimm's riddle, O'Dimm is forced to
|
|
||||||
release both Geralt and von Everec from their pacts. von Everec, now mortal
|
|
||||||
again, regains his emotions and immediately feels regret for his past
|
|
||||||
actions and mistakes. He gives Geralt his family sword, and promises to
|
|
||||||
start a new life free from O'Dimm's control.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
3333333333333333333333333
|
|
||||||
|
|
||||||
Geralt takes up a contract sent out by Olgierd von Everec, who tasks him
|
|
||||||
with eliminating a giant toad monster in the sewers of Oxenfurt. While
|
|
||||||
hunting the monster, Geralt runs into Shani, a Redanian medic and an old
|
|
||||||
acquaintance of his, whom he has the option of romancing. Geralt then kills
|
|
||||||
the toad monster, only to find it was actually a cursed Ofieri prince. The
|
|
||||||
prince's guards capture Geralt with the intention of executing him. While
|
|
||||||
awaiting his execution en route to Ofier, Geralt is approached by the
|
|
||||||
mysterious Gaunter O'Dimm. O'Dimm helps Geralt escape, but in return Geralt
|
|
||||||
must help O'Dimm recover a debt from von Everec, who had set up Geralt
|
|
||||||
knowing the toad monster was an Ofieri prince. O'Dimm tells Geralt that
|
|
||||||
according to terms of his contract with von Everec, he must fulfill three
|
|
||||||
of von Everec's wishes. Geralt confronts von Everec and discovers that von
|
|
||||||
Everec had obtained immortality at the cost of his emotions, giving him a
|
|
||||||
"Heart of Stone". He admits to cursing the Ofieri prince since he was
|
|
||||||
arranged to marry his true love Iris, and that he wished for immortality in
|
|
||||||
order to be with her. He then tells Geralt his three wishes: to entertain
|
|
||||||
his brother Vlodomir for one night, to get revenge on the Borsodi family by
|
|
||||||
obtaining Maximillian Borsodi's house, and to obtain the violet rose he had
|
|
||||||
given to Iris. O'Dimm tells Geralt that the three tasks are meant to be
|
|
||||||
impossible, as Maximillian Borsodi's house is kept in a highly secure vault
|
|
||||||
and both Vlodomir and Iris have been dead for years, but he agrees to
|
|
||||||
assist Geralt.
|
|
||||||
|
|
||||||
With O'Dimm's help, Geralt allows Vlodimir's spirit to possess his body for
|
|
||||||
one night, allowing him to attend a wedding party and fulfilling the first
|
|
||||||
wish. Geralt then participates in a heist to steal Maximillian Borsodi's
|
|
||||||
house from its vault, and finds that it contains a will that would grant
|
|
||||||
the entire Borsodi fortune to charity, fulfilling von Everec's revenge and
|
|
||||||
second wish. To obtain Iris' rose, Geralt enlists the help of demonic
|
|
||||||
entities to gain access to a supernatural realm where he witnesses von
|
|
||||||
Everec and Iris' past. There, he learns that due to his "Heart of Stone",
|
|
||||||
von Everec could not truly love Iris and she died neglected and unhappy.
|
|
||||||
Geralt, on player's choice can either obtain the rose from Iris' spirit in
|
|
||||||
order to free her from "pinned" into the world or let the rose be with her.
|
|
||||||
Either way, Geralt fulfills von Everec's last wish and goes to meet with
|
|
||||||
him. Along the way, he learns that O'Dimm is in fact an ancient entity of
|
|
||||||
pure evil that thrives off tricking people into trading away their souls in
|
|
||||||
return for wishes. When Geralt meets with von Everec, the three wishes are
|
|
||||||
fulfilled and O'Dimm arrives to collect von Everec's soul.
|
|
||||||
|
|
||||||
At this point, Geralt has the option of allowing O'Dimm to take von
|
|
||||||
Everec's soul or intervening to save von Everec. If Geralt does nothing,
|
|
||||||
O'Dimm kills von Everec, takes his soul, and rewards Geralt with one wish.
|
|
||||||
If Geralt intervenes, he challenges O'Dimm by wagering his own soul to save
|
|
||||||
von Everec. After Geralt solves O'Dimm's riddle, O'Dimm is forced to
|
|
||||||
release both Geralt and von Everec from their pacts. von Everec, now mortal
|
|
||||||
again, regains his emotions and immediately feels regret for his past
|
|
||||||
actions and mistakes. He gives Geralt his family sword, and promises to
|
|
||||||
start a new life free from O'Dimm's control.
|
|
||||||
|
|
||||||
4444444444444444444444444
|
|
||||||
|
|
||||||
|
|
||||||
Geralt takes up a contract sent out by Olgierd von Everec, who tasks him
|
|
||||||
with eliminating a giant toad monster in the sewers of Oxenfurt. While
|
|
||||||
hunting the monster, Geralt runs into Shani, a Redanian medic and an old
|
|
||||||
acquaintance of his, whom he has the option of romancing. Geralt then kills
|
|
||||||
the toad monster, only to find it was actually a cursed Ofieri prince. The
|
|
||||||
prince's guards capture Geralt with the intention of executing him. While
|
|
||||||
awaiting his execution en route to Ofier, Geralt is approached by the
|
|
||||||
mysterious Gaunter O'Dimm. O'Dimm helps Geralt escape, but in return Geralt
|
|
||||||
must help O'Dimm recover a debt from von Everec, who had set up Geralt
|
|
||||||
knowing the toad monster was an Ofieri prince. O'Dimm tells Geralt that
|
|
||||||
according to terms of his contract with von Everec, he must fulfill three
|
|
||||||
of von Everec's wishes. Geralt confronts von Everec and discovers that von
|
|
||||||
Everec had obtained immortality at the cost of his emotions, giving him a
|
|
||||||
"Heart of Stone". He admits to cursing the Ofieri prince since he was
|
|
||||||
arranged to marry his true love Iris, and that he wished for immortality in
|
|
||||||
order to be with her. He then tells Geralt his three wishes: to entertain
|
|
||||||
his brother Vlodomir for one night, to get revenge on the Borsodi family by
|
|
||||||
obtaining Maximillian Borsodi's house, and to obtain the violet rose he had
|
|
||||||
given to Iris. O'Dimm tells Geralt that the three tasks are meant to be
|
|
||||||
impossible, as Maximillian Borsodi's house is kept in a highly secure vault
|
|
||||||
and both Vlodomir and Iris have been dead for years, but he agrees to
|
|
||||||
assist Geralt.
|
|
||||||
|
|
||||||
With O'Dimm's help, Geralt allows Vlodimir's spirit to possess his body for
|
|
||||||
one night, allowing him to attend a wedding party and fulfilling the first
|
|
||||||
wish. Geralt then participates in a heist to steal Maximillian Borsodi's
|
|
||||||
house from its vault, and finds that it contains a will that would grant
|
|
||||||
the entire Borsodi fortune to charity, fulfilling von Everec's revenge and
|
|
||||||
second wish. To obtain Iris' rose, Geralt enlists the help of demonic
|
|
||||||
entities to gain access to a supernatural realm where he witnesses von
|
|
||||||
Everec and Iris' past. There, he learns that due to his "Heart of Stone",
|
|
||||||
von Everec could not truly love Iris and she died neglected and unhappy.
|
|
||||||
Geralt, on player's choice can either obtain the rose from Iris' spirit in
|
|
||||||
order to free her from "pinned" into the world or let the rose be with her.
|
|
||||||
Either way, Geralt fulfills von Everec's last wish and goes to meet with
|
|
||||||
him. Along the way, he learns that O'Dimm is in fact an ancient entity of
|
|
||||||
pure evil that thrives off tricking people into trading away their souls in
|
|
||||||
return for wishes. When Geralt meets with von Everec, the three wishes are
|
|
||||||
fulfilled and O'Dimm arrives to collect von Everec's soul.
|
|
||||||
|
|
||||||
At this point, Geralt has the option of allowing O'Dimm to take von
|
|
||||||
Everec's soul or intervening to save von Everec. If Geralt does nothing,
|
|
||||||
O'Dimm kills von Everec, takes his soul, and rewards Geralt with one wish.
|
|
||||||
If Geralt intervenes, he challenges O'Dimm by wagering his own soul to save
|
|
||||||
von Everec. After Geralt solves O'Dimm's riddle, O'Dimm is forced to
|
|
||||||
release both Geralt and
|
|
||||||
--001a11479a7cf5bcb6053903371b--
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
Return-path: <who@somewhere.net>
|
|
||||||
Delivery-date: Sat, 01 Jun 2013 00:30:16 +0000
|
|
||||||
Content-Type: text/plain; charset=us-ascii
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
Subject: Flat tire
|
|
||||||
From: Somebody <somebody@somewhere.com>
|
|
||||||
Message-Id: <8E4EA9F3-4F4D-45D5-94F8-D3B91B68ABC8@somewhere.net>
|
|
||||||
Date: Fri, 31 May 2013 16:39:45 -0700
|
|
||||||
To: something@somewhere.net
|
|
||||||
Mime-Version: 1.0 (1.0)
|
|
||||||
X-Mailer: iPhone Mail (10B329)
|
|
||||||
|
|
||||||
The one of us with a bike pump is far ahead, but a man stopped to help us an=
|
|
||||||
d gave us his pump.
|
|
||||||
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
X-sender: <sender@sendersdomain.com>
|
|
||||||
X-receiver: <somerecipient@recipientdomain.com>
|
|
||||||
From: "Senders Name" <sender@sendersdomain.com>
|
|
||||||
To: "Recipient Name" <somerecipient@recipientdomain.com>
|
|
||||||
Message-ID: <5bec11c119194c14999e592feb46e3cf@sendersdomain.com>
|
|
||||||
Date: Sat, 24 Sep 2005 15:06:49 -0400
|
|
||||||
Subject: Sample Multi-Part
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: multipart/alternative; boundary="----=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D"
|
|
||||||
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D
|
|
||||||
Content-type: text/plain; charset=iso-8859-1
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Sample Text Content
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D
|
|
||||||
Content-Type: multipart/alternative; boundary="----=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C"
|
|
||||||
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C
|
|
||||||
Content-Type: text/plain; charset=iso-8859-1
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Multipart inside of multipart!
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C
|
|
||||||
Content-type: text/html; charset=iso-8859-1
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
<html>
|
|
||||||
<h1>Hello!</h1>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C--
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D--
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
X-sender: <sender@sendersdomain.com>
|
|
||||||
X-receiver: <somerecipient@recipientdomain.com>
|
|
||||||
From: "Senders Name" <sender@sendersdomain.com>
|
|
||||||
To: "Recipient Name" <somerecipient@recipientdomain.com>
|
|
||||||
Message-ID: <5bec11c119194c14999e592feb46e3cf@sendersdomain.com>
|
|
||||||
Date: Sat, 24 Sep 2005 15:06:49 -0400
|
|
||||||
Subject: Sample Multi-Part
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: multipart/alternative; boundary="----=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D"
|
|
||||||
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D
|
|
||||||
Content-type: text/plain; charset=iso-8859-1
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Sample Text Content
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D
|
|
||||||
Content-Type: multipart/alternative; boundary="----=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C"
|
|
||||||
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C
|
|
||||||
Content-Type: text/plain; charset=iso-8859-1
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Multipart inside of multipart!
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C
|
|
||||||
Content-type: text/html; charset=iso-8859-1
|
|
||||||
X-Django-Mailbox-Altered-Message: Stripped; Content type text/html not allowed
|
|
||||||
|
|
||||||
------=_OtherPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB011C--
|
|
||||||
------=_NextPart_DC7E1BB5_1105_4DB3_BAE3_2A6208EB099D--
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
MIME-Version: 1.0
|
|
||||||
Received: by 10.221.0.211 with HTTP; Sun, 20 Jan 2013 12:07:07 -0800 (PST)
|
|
||||||
X-Originating-IP: [24.22.122.177]
|
|
||||||
Date: Sun, 20 Jan 2013 12:07:07 -0800
|
|
||||||
Delivered-To: test@adamcoddington.net
|
|
||||||
Message-ID: <CAMdmm+jYCgrxrekAxszmDnBjAytcBym-Ec+uM-+HEtzuKy=M_g@mail.gmail.com>
|
|
||||||
Subject: Message With Attachment
|
|
||||||
From: Adam Coddington <test@adamcoddington.net>
|
|
||||||
To: Adam Coddington <test@adamcoddington.net>
|
|
||||||
Content-Type: multipart/mixed; boundary=047d7b33dd729737fe04d3bde348
|
|
||||||
|
|
||||||
--047d7b33dd729737fe04d3bde348
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
|
|
||||||
This message has an attachment.
|
|
||||||
|
|
||||||
--047d7b33dd729737fe04d3bde348
|
|
||||||
Content-Type: image/png; name="ð̞oβ̞le.png"
|
|
||||||
Content-Disposition: attachment; filename="ð̞oβ̞le.png"
|
|
||||||
X-Attachment-Id: f_hc6mair60
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
|
|
||||||
iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAFoTx1HAAAAzUlEQVQoz32RWxXDIBBEr4NIQEIl
|
|
||||||
ICESkFAJkRAJSIgEpEQCEqYfu6QUkn7sCcyDGQiSACKSKCAkGwBJwhDwZQNMEiYAIBdQvk7rfaHf
|
|
||||||
AO8NBJwCxTGhtFgTHVNaNaJeWFu44AXEHzKCktc7zZ0vss+bMoHSiM2b9mQoX1eZCgGqnWskY3gi
|
|
||||||
XXAAxb8BqFiUgBNY7k49Tu/kV7UKPsefrjEOT9GmghYzrk9V03pjDGYKj3d0c06dKZkpTboRaD9o
|
|
||||||
B+1m2m81d2Az948xzgdjLaFe95e83AAAAABJRU5ErkJggg==
|
|
||||||
|
|
||||||
--047d7b33dd729737fe04d3bde348--
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
Date: Fri, 30 Jan 2012 11:30:01 PST
|
|
||||||
Subject: Tjest
|
|
||||||
From: "Somebody" <somebody@somewhere.com>
|
|
||||||
To: idontknow@somewhere.com
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset="cp1251"
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
|
|
||||||
Ýòî ñîîáùåíèå èìååò íåïðàâèëüíóþ êîäèðîâêà.
|
|
||||||
|
|
@ -1,67 +0,0 @@
|
||||||
Received: from mxfront40.mail.yandex.net ([127.0.0.1])
|
|
||||||
by mxfront40.mail.yandex.net with LMTP id 1kYaj2Z0
|
|
||||||
for <mr.test32@yandex.ru>; Mon, 21 Apr 2014 17:01:46 +0400
|
|
||||||
Received: from f284.i.mail.ru (f284.i.mail.ru [217.69.138.184])
|
|
||||||
by mxfront40.mail.yandex.net (nwsmtp/Yandex) with ESMTPS id 5ybtvC8EjR-1k5qERXS;
|
|
||||||
Mon, 21 Apr 2014 17:01:46 +0400
|
|
||||||
(using TLSv1 with cipher AES256-SHA (256/256 bits))
|
|
||||||
(Client certificate not present)
|
|
||||||
X-Yandex-Front: mxfront40.mail.yandex.net
|
|
||||||
X-Yandex-TimeMark: 1398085306
|
|
||||||
X-Yandex-Uniq: 048ae9ee-4930-499b-803d-4e7c7dd64da5
|
|
||||||
Authentication-Results: mxfront40.mail.yandex.net; spf=pass (mxfront40.mail.yandex.net: domain of mail.ru designates 217.69.138.184 as permitted sender) smtp.mail=mr.test32@mail.ru; dkim=pass header.i=@mail.ru
|
|
||||||
X-Yandex-Spam: 1
|
|
||||||
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2;
|
|
||||||
h=Content-Type:Message-ID:Reply-To:Date:Mime-Version:Subject:To:From; bh=oJMg2fPrmKvsyMXib8I9eF7JpnqtQmXIK5Ve6pwFXSI=;
|
|
||||||
b=VG3S4nAtfFv+yQMf1Ubtb4y29mTOQL73foRmudvkAdAaPhRjFb+84OspikmmFKbK+jRfanFWkXjQWa9B72uK7d8F4NsO3e9a+MffXcMtsz9AgmFe72Af7sQrXiqkwmUGeG/TQtPjR5E/gi3IHFrHFQD+apER59c8AlqEoQLvrRg=;
|
|
||||||
Received: from mail by f284.i.mail.ru with local (envelope-from <mr.test32@mail.ru>)
|
|
||||||
id 1WcDr0-0006oa-11
|
|
||||||
for mr.test32@yandex.ru; Mon, 21 Apr 2014 17:01:46 +0400
|
|
||||||
Received: from [144.206.32.69] by e.mail.ru with HTTP;
|
|
||||||
Mon, 21 Apr 2014 17:01:45 +0400
|
|
||||||
From: =?UTF-8?B?dGVzdCB0ZXN0?= <mr.test32@mail.ru>
|
|
||||||
To: mr.test32@yandex.ru
|
|
||||||
Subject: Óçíàé êàê çàðàáàòûâàòü îò 1000$ â íåäåëþ!
|
|
||||||
|
|
||||||
Content-Type: text/html;
|
|
||||||
charset="iso-8859-1"
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
X-Spam_score: 7.1
|
|
||||||
X-Spam_score_int: 71
|
|
||||||
X-Spam_bar: +++++++
|
|
||||||
X-Spam_report: Spam detection software, running on the system , has
|
|
||||||
identified this incoming email as possible spam. The original message
|
|
||||||
has been attached to this so you can view it (if it isn't spam) or label
|
|
||||||
similar future email. If you have any questions, see
|
|
||||||
The administrator of that system for details.
|
|
||||||
|
|
||||||
Content preview: [...]
|
|
||||||
|
|
||||||
Content analysis details: (7.1 points, 2.0 required)
|
|
||||||
|
|
||||||
pts rule name description
|
|
||||||
---- ---------------------- --------------------------------------------------
|
|
||||||
1.3 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net
|
|
||||||
[Blocked - see <http://www.spamcop.net/bl.shtml?201.216.250.71>]
|
|
||||||
1.4 RCVD_IN_BRBL_LASTEXT RBL: RCVD_IN_BRBL_LASTEXT
|
|
||||||
[201.216.250.71 listed in bb.barracudacentral.org]
|
|
||||||
0.0 HTML_EXTRA_CLOSE BODY: HTML contains far too many close tags
|
|
||||||
0.0 HTML_MESSAGE BODY: HTML included in message
|
|
||||||
0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60%
|
|
||||||
[score: 0.5000]
|
|
||||||
0.7 MIME_HTML_ONLY BODY: Message only has text/html MIME parts
|
|
||||||
1.2 HTML_IMAGE_ONLY_04 BODY: HTML: images with 0-400 bytes of words
|
|
||||||
1.5 SUBJ_ILLEGAL_CHARS Subject: has too many raw illegal characters
|
|
||||||
0.0 SUBJECT_NEEDS_ENCODING SUBJECT_NEEDS_ENCODING
|
|
||||||
0.0 HTML_SHORT_LINK_IMG_1 HTML is very short with a linked image
|
|
||||||
0.0 T_REMOTE_IMAGE Message contains an external image
|
|
||||||
|
|
||||||
<html>
|
|
||||||
<body>
|
|
||||||
<tbody>
|
|
||||||
</p>
|
|
||||||
<a href="http://nemetica.pl/b.php"><img
|
|
||||||
src="http://silamisli.yomu.ru/b.php?jpg"></a>
|
|
||||||
</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
MIME-Version: 1.0
|
|
||||||
Received: by 10.76.173.10 with HTTP; Tue, 7 Jul 2015 19:50:29 -0700 (PDT)
|
|
||||||
X-Originating-IP: [71.63.222.120]
|
|
||||||
Date: Tue, 7 Jul 2015 19:50:29 -0700
|
|
||||||
Delivered-To: me@adamcoddington.net
|
|
||||||
Message-ID: <CAMdmm+ixRrk+SY2ktbTbGcQctY0VrCZ9C2VJtMqwiY3Zce23Ng@mail.gmail.com>
|
|
||||||
Subject: Test e-mail message
|
|
||||||
From: Adam Coddington <me@adamcoddington.net>
|
|
||||||
To: Adam Coddington <me@adamcoddington.net>
|
|
||||||
Content-Type: multipart/mixed; boundary=089e0111d1089c45be051a5433d8
|
|
||||||
|
|
||||||
--089e0111d1089c45be051a5433d8
|
|
||||||
Content-Type: multipart/alternative; boundary=089e0111d1089c45b4051a5433d6
|
|
||||||
|
|
||||||
--089e0111d1089c45b4051a5433d6
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
|
|
||||||
Has an attached text document, too!
|
|
||||||
|
|
||||||
--089e0111d1089c45b4051a5433d6
|
|
||||||
Content-Type: text/html; charset=UTF-8
|
|
||||||
|
|
||||||
<div dir="ltr">Has an attached text document, too!</div>
|
|
||||||
|
|
||||||
--089e0111d1089c45b4051a5433d6--
|
|
||||||
--089e0111d1089c45be051a5433d8
|
|
||||||
Content-Type: text/plain; charset=US-ASCII; name="attachment.txt"
|
|
||||||
Content-Disposition: attachment; filename="attachment.txt"
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
X-Attachment-Id: f_ibu64edo0
|
|
||||||
|
|
||||||
VGhpcyBpcyBhbiBhdHRhY2htZW50Lgo=
|
|
||||||
--089e0111d1089c45be051a5433d8--
|
|
||||||
|
|
@ -1,58 +0,0 @@
|
||||||
Return-path: <SRS0=9Ddk64=SW=REDACTED=kontakt@porady.REDACTED>
|
|
||||||
Envelope-to: porady@REDACTED
|
|
||||||
Delivery-date: Thu, 30 Jun 2016 12:52:33 +0200
|
|
||||||
Received: from s33.linuxpl.com ([88.198.46.46])
|
|
||||||
by s50.hekko.net.pl with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256)
|
|
||||||
(Exim 4.87)
|
|
||||||
(envelope-from <kontakt@REDACTED>)
|
|
||||||
id 1bIZaC-0000Cx-W0
|
|
||||||
for porady@REDACTED; Thu, 30 Jun 2016 12:52:33 +0200
|
|
||||||
Received: from [127.0.0.1] (helo=s33.linuxpl.com)
|
|
||||||
by s33.linuxpl.com with esmtpa (Exim 4.87)
|
|
||||||
(envelope-from <kontakt@REDACTED>)
|
|
||||||
id 1bIZaB-0002KZ-Lq
|
|
||||||
for porady@REDACTED; Thu, 30 Jun 2016 12:52:31 +0200
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: multipart/mixed;
|
|
||||||
boundary="=_23825343e9a28de91c2eec59d6c7d4bf"
|
|
||||||
Date: Thu, 30 Jun 2016 12:52:31 +0200
|
|
||||||
From: Kontakt <kontakt@REDACTED>
|
|
||||||
To: porady@REDACTED
|
|
||||||
Subject: =?UTF-8?Q?Odpowied=C5=BA_od_burmistrza_na_wniosek_stowarzyszenia?=
|
|
||||||
Organization: VE-TO
|
|
||||||
Message-ID: <8cd4a49b11cf9a1867432bd5909a06bb@REDACTED>
|
|
||||||
X-Sender: kontakt@REDACTED
|
|
||||||
User-Agent: Roundcube Webmail/1.1.4
|
|
||||||
X-HEKKO: 88.198.46.46:
|
|
||||||
|
|
||||||
--=_23825343e9a28de91c2eec59d6c7d4bf
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
Content-Type: text/plain; charset=UTF-8;
|
|
||||||
format=flowed
|
|
||||||
|
|
||||||
REDACTED
|
|
||||||
------------------------------------------------------------------------------------
|
|
||||||
Niniejsza wiadomość elektroniczna [lub jej załączniki] może zawierać
|
|
||||||
poufne lub chronione prawem informacje, które przeznaczone są wyłącznie
|
|
||||||
dla adresata tej wiadomości.
|
|
||||||
Należy dołożyć należytej staranności w celu nie ujawniania ich osobom
|
|
||||||
trzecim.
|
|
||||||
--=_23825343e9a28de91c2eec59d6c7d4bf
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
Content-Type: image/jpeg;
|
|
||||||
name="=?UTF-8?Q?pi=C5=82kochwyty=2Ejpg?="
|
|
||||||
Content-Disposition: attachment;
|
|
||||||
filename*=UTF-8''pi%C5%82kochwyty.jpg;
|
|
||||||
size=465813
|
|
||||||
|
|
||||||
UkVEQUNURUQK
|
|
||||||
--=_23825343e9a28de91c2eec59d6c7d4bf
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
Content-Type: image/jpeg;
|
|
||||||
name="=?UTF-8?Q?odpowied=C5=BA_Burmistrza=2Ejpg?="
|
|
||||||
Content-Disposition: attachment;
|
|
||||||
filename*=UTF-8''odpowied%C5%BA%20Burmistrza.jpg;
|
|
||||||
size=544348
|
|
||||||
|
|
||||||
UkVEQUNURUQK
|
|
||||||
--=_23825343e9a28de91c2eec59d6c7d4bf--
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
Delivered-To: user1@example.com
|
|
||||||
Received: by 10.76.18.165 with SMTP id x5csp6205oad;
|
|
||||||
Sat, 5 Jan 2013 17:59:14 -0800 (PST)
|
|
||||||
X-Received: by 10.66.80.202 with SMTP id t10mr166379994pax.81.1357437554302;
|
|
||||||
Sat, 05 Jan 2013 17:59:14 -0800 (PST)
|
|
||||||
Return-Path: <SRS0=JyPW=K7=yahoo.com=user2@bounce.secureserver.net>
|
|
||||||
Received: from p3plsmtp10-04.prod.phx3.secureserver.net (p3plsmtp10-04.prod.phx3.secureserver.net. [123.123.123.123])
|
|
||||||
by mx.google.com with ESMTP id u7si55229097paw.156.2013.01.05.17.59.12;
|
|
||||||
Sat, 05 Jan 2013 17:59:14 -0800 (PST)
|
|
||||||
Received-SPF: pass (google.com: domain of SRS0=JyPW=K7=yahoo.com=user2@bounce.secureserver.net designates 123.123.123.123 as permitted sender) client-ip=123.123.123.123;
|
|
||||||
Authentication-Results: mx.google.com; spf=pass (google.com: domain of SRS0=JyPW=K7=yahoo.com=user2@bounce.secureserver.net designates 123.123.123.123 as permitted sender) smtp.mail=SRS0=JyPW=K7=yahoo.com=user2@bounce.secureserver.net; dkim=pass header.i=@yahoo.com
|
|
||||||
Received: (qmail 339 invoked from network); 6 Jan 2013 01:59:12 -0000
|
|
||||||
Delivered-To: user3@example.com
|
|
||||||
Precedence: bulk
|
|
||||||
Received: (qmail 336 invoked by uid 30297); 6 Jan 2013 01:59:12 -0000
|
|
||||||
Received: from unknown (HELO p3pismtp01-063.prod.phx3.secureserver.net) ([10.6.12.182])
|
|
||||||
(envelope-sender <user2@yahoo.com>)
|
|
||||||
by p3plsmtp10-04.prod.phx3.secureserver.net (qmail-1.03) with SMTP
|
|
||||||
for <user3@example.com>; 6 Jan 2013 01:59:12 -0000
|
|
||||||
X-IronPort-Anti-Spam-Result: AmkQAGLY6FBiilvXbmdsb2JhbAAvEwOHXYYInRqSVhYODQkMBhYngh4BASMBIQEIBSUHCwoFEQMBAhQ6EhQKHAUdBIdjAQMPDJcyjnwkgnuDbwEjJwOGcwYKAotcagMIEHoFgykDiCyDJoFohn+BWYVkLkGEXYglgUkCAwQX
|
|
||||||
Received: from nm27-vm2.bullet.mail.ne1.yahoo.com ([98.138.91.215])
|
|
||||||
by p3pismtp01-063.prod.phx3.secureserver.net with ESMTP; 05 Jan 2013 18:59:11 -0700
|
|
||||||
Received: from [123.123.123.123] by nm27.bullet.mail.ne1.yahoo.com with NNFMP; 06 Jan 2013 01:59:08 -0000
|
|
||||||
Received: from [123.123.123.123] by tm5.bullet.mail.ne1.yahoo.com with NNFMP; 06 Jan 2013 01:59:08 -0000
|
|
||||||
Received: from [127.0.0.1] by smtp120-mob.biz.mail.ne1.yahoo.com with NNFMP; 06 Jan 2013 01:59:08 -0000
|
|
||||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1357437548; bh=j9eMknAL8YCreS+PbgbAzzAQMit5AJ87f7DXzFjDFRo=; h=X-Yahoo-Newman-Id:Message-ID:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Date:Subject:From:To:CC:MIME-Version:Content-Type:Content-Transfer-Encoding:X-Mailer; b=zYM501CTyiUtnTD1JFZlKIma5xV8Eu7m5mpgB/8gyZtBVEbCboDfJjqN4VNLUTC0w1AQO//dvW/Ir3ZbM6NVgvsT39hqx/RjY+CKHh/5VwVRaQgDiZznqrzVMSt/XsokA1gbPhtTFlpE5uiyzx39Zj6OwqFLHYTzAbWAMQ6IJCo=
|
|
||||||
X-Yahoo-Newman-Id: 388586.81550.bm@smtp120-mob.biz.mail.ne1.yahoo.com
|
|
||||||
Message-ID: <388586.81550.bm@smtp120-mob.biz.mail.ne1.yahoo.com>
|
|
||||||
X-Yahoo-Newman-Property: ymail-3
|
|
||||||
X-YMail-OSG: URwIIAQVM1kAga269ds2iV1suOTImektR4w6BYjFmP8vp0X
|
|
||||||
IUkN.Y8FSBOvb.6jCOF.LoIp2HxYepgZj1wbmbSpntFhshBFQZa6Wp2eGduY
|
|
||||||
exmK.gdLKnQoZdjyoCoxAZ.tA9.CL5fRijaLa7zv3XFWHs62FjtDCbrPoPrC
|
|
||||||
FqvjQf41TR3aKNOYyALf7hHkHdA5RiU9vHelpU8jyTo8DSV1aucIGJqpSLda
|
|
||||||
mFHkMzcl57HESZkRfGbp_iC0DhNdzRVGTfQSNcs.wSfrpSgzqM1VhkU5_JAJ
|
|
||||||
qdHTyl4RT27ofNZu3ch6gdZeqrv54vDLLAdWZRwL0rzBGKKKV.tzWOB.0JZ3
|
|
||||||
KRz_A75EcTDQlGKmb79MWbWZZydO_r2QgCfsFcyLGmoqcLE_yLpxdTC4KkRC
|
|
||||||
AFDsB0fS_wT5z2z2s_jk8aLIbtJ60D7BfrUW2MdxuqBeRuG2uzkX6V5Ls0BQ
|
|
||||||
5OKDv7BEHipYhl6NnhrzW1SPcxWB3emTVgTMV6xLC5SsKvHwbAEWoMjbdHKh
|
|
||||||
CgH9Y3_7tEccw4cOJhMuLAGTwbY4Ou0s.JmUbIrgTH6zTLkzcuFzYUBji7dO
|
|
||||||
3a3aujVZnMz9wAI0dgFfG4zZD6rb4MyF5qRBbuSDR8Y39FGyY1iAScA_RDsU
|
|
||||||
QaA--
|
|
||||||
X-Yahoo-SMTP: HDH0Fu.swBDT3Lu6hwn51OaZQ.iA
|
|
||||||
Received: from ap1.p9.sca.7sys.net (user2@123.123.123.123 with xymcookie)
|
|
||||||
by smtp120-mob.biz.mail.ne1.yahoo.com with SMTP; 05 Jan 2013 17:59:08 -0800 PST
|
|
||||||
Date: Sat, 05 Jan 2013 19:59:07 CST
|
|
||||||
Subject: RE: Fwd: Stuff
|
|
||||||
From: "Person" <user2@yahoo.com>
|
|
||||||
To: user3@example.com
|
|
||||||
CC:
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset="iso-8859-1"
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
X-Mailer: Seven Enterprise Gateway (v 2.0)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
This message contains funny UTF16 characters like this one: " " and this one "✿".
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
Return-path: <test@adamcoddington.net>
|
|
||||||
Delivery-date: Thu, 17 Jan 2013 19:26:25 +0000
|
|
||||||
Received: by mail-vc0-f174.google.com with SMTP id n11so944457vch.33
|
|
||||||
for <ya@dumayju.net>; Thu, 17 Jan 2013 11:26:20 -0800 (PST)
|
|
||||||
X-Received: by 10.220.226.68 with SMTP id iv4mr332182vcb.31.1358450780039;
|
|
||||||
Thu, 17 Jan 2013 11:26:20 -0800 (PST)
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Received: by 10.221.0.211 with HTTP; Thu, 17 Jan 2013 11:25:59 -0800 (PST)
|
|
||||||
X-Originating-IP: [67.131.102.78]
|
|
||||||
From: Adam Coddington <test@adamcoddington.net>
|
|
||||||
Date: Thu, 17 Jan 2013 11:25:59 -0800
|
|
||||||
Message-ID: <CAMdmm+hK=swkM_SJ3EfoAO-AAE1Rr8Nyd5-OU3BHG6_1u5AdUw@mail.gmail.com>
|
|
||||||
Subject: Test Multipart Text E-mail
|
|
||||||
To: test@latestrevision.net
|
|
||||||
Content-Type: multipart/alternative; boundary=14dae9cdc8cb30695204d380f8a2
|
|
||||||
X-Gm-Message-State: ALoCoQm0/CGO1NxYZBBXjGN7748Ohv5P068bWQiELfbo+g19i80yvx1xi0th+N28ElGN1oS06SuR
|
|
||||||
|
|
||||||
--14dae9cdc8cb30695204d380f8a2
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
|
|
||||||
Hello there!
|
|
||||||
|
|
||||||
--14dae9cdc8cb30695204d380f8a2
|
|
||||||
Content-Type: text/html; charset=UTF-8
|
|
||||||
|
|
||||||
<div dir="ltr">Hello there!</div>
|
|
||||||
|
|
||||||
--14dae9cdc8cb30695204d380f8a2--
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
# all imports below are only used by external modules
|
|
||||||
# flake8: noqa
|
|
||||||
from django_mailbox.transports.imap import ImapTransport
|
|
||||||
from django_mailbox.transports.pop3 import Pop3Transport
|
|
||||||
from django_mailbox.transports.maildir import MaildirTransport
|
|
||||||
from django_mailbox.transports.mbox import MboxTransport
|
|
||||||
from django_mailbox.transports.babyl import BabylTransport
|
|
||||||
from django_mailbox.transports.mh import MHTransport
|
|
||||||
from django_mailbox.transports.mmdf import MMDFTransport
|
|
||||||
from django_mailbox.transports.gmail import GmailImapTransport
|
|
||||||
3
django_mailbox2/__init__.py
Normal file
3
django_mailbox2/__init__.py
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
__version__ = "0.1.3"
|
||||||
|
|
||||||
|
default_app_config = "django_mailbox2.apps.MailBoxConfig"
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Model configuration in application ``django_mailbox`` for administration
|
Model configuration in application ``django_mailbox2`` for administration
|
||||||
console.
|
console.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
@ -11,9 +11,9 @@ from django.conf import settings
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from django_mailbox.models import MessageAttachment, Message, Mailbox
|
from django_mailbox2.models import MessageAttachment, Message, Mailbox
|
||||||
from django_mailbox.signals import message_received
|
from django_mailbox2.signals import message_received
|
||||||
from django_mailbox.utils import convert_header_to_unicode
|
from django_mailbox2.utils import convert_header_to_unicode
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
@ -3,5 +3,5 @@ from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
|
|
||||||
class MailBoxConfig(AppConfig):
|
class MailBoxConfig(AppConfig):
|
||||||
name = "django_mailbox"
|
name = "django_mailbox2"
|
||||||
verbose_name = _("Mail Box")
|
verbose_name = _("Mail Box 2")
|
||||||
|
|
@ -2,7 +2,7 @@ import logging
|
||||||
|
|
||||||
from django.core.management.base import BaseCommand
|
from django.core.management.base import BaseCommand
|
||||||
|
|
||||||
from django_mailbox.models import Mailbox
|
from django_mailbox2.models import Mailbox
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
@ -9,7 +9,7 @@ except ImportError:
|
||||||
|
|
||||||
from django.core.management.base import BaseCommand
|
from django.core.management.base import BaseCommand
|
||||||
|
|
||||||
from django_mailbox.models import Mailbox
|
from django_mailbox2.models import Mailbox
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
@ -4,7 +4,7 @@ import logging
|
||||||
|
|
||||||
from django.core.management.base import BaseCommand
|
from django.core.management.base import BaseCommand
|
||||||
|
|
||||||
from django_mailbox.models import MessageAttachment, Message
|
from django_mailbox2.models import MessageAttachment, Message
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
logging.basicConfig(level=logging.INFO)
|
logging.basicConfig(level=logging.INFO)
|
||||||
|
|
@ -106,7 +106,7 @@ class Migration(migrations.Migration):
|
||||||
related_name="replies",
|
related_name="replies",
|
||||||
verbose_name="In reply to",
|
verbose_name="In reply to",
|
||||||
blank=True,
|
blank=True,
|
||||||
to="django_mailbox.Message",
|
to="django_mailbox2.Message",
|
||||||
null=True,
|
null=True,
|
||||||
on_delete=models.CASCADE,
|
on_delete=models.CASCADE,
|
||||||
),
|
),
|
||||||
|
|
@ -116,7 +116,7 @@ class Migration(migrations.Migration):
|
||||||
models.ForeignKey(
|
models.ForeignKey(
|
||||||
related_name="messages",
|
related_name="messages",
|
||||||
verbose_name="Mailbox",
|
verbose_name="Mailbox",
|
||||||
to="django_mailbox.Mailbox",
|
to="django_mailbox2.Mailbox",
|
||||||
on_delete=models.CASCADE,
|
on_delete=models.CASCADE,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
@ -153,7 +153,7 @@ class Migration(migrations.Migration):
|
||||||
related_name="attachments",
|
related_name="attachments",
|
||||||
verbose_name="Message",
|
verbose_name="Message",
|
||||||
blank=True,
|
blank=True,
|
||||||
to="django_mailbox.Message",
|
to="django_mailbox2.Message",
|
||||||
null=True,
|
null=True,
|
||||||
on_delete=models.CASCADE,
|
on_delete=models.CASCADE,
|
||||||
),
|
),
|
||||||
|
|
@ -4,7 +4,7 @@ from django.db import models, migrations
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("django_mailbox", "0001_initial"),
|
("django_mailbox2", "0001_initial"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
@ -4,7 +4,7 @@ from django.db import models, migrations
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("django_mailbox", "0002_add_eml_to_message"),
|
("django_mailbox2", "0002_add_eml_to_message"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
@ -4,7 +4,7 @@ from django.db import models, migrations
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("django_mailbox", "0003_auto_20150409_0316"),
|
("django_mailbox2", "0003_auto_20150409_0316"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
import django_mailbox.utils
|
import django_mailbox2.utils
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("django_mailbox", "0004_bytestring_to_unicode"),
|
("django_mailbox2", "0004_bytestring_to_unicode"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
@ -13,7 +13,7 @@ class Migration(migrations.Migration):
|
||||||
model_name="messageattachment",
|
model_name="messageattachment",
|
||||||
name="document",
|
name="document",
|
||||||
field=models.FileField(
|
field=models.FileField(
|
||||||
upload_to=django_mailbox.utils.get_attachment_save_path,
|
upload_to=django_mailbox2.utils.get_attachment_save_path,
|
||||||
verbose_name="Document",
|
verbose_name="Document",
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
@ -6,7 +6,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("django_mailbox", "0005_auto_20160523_2240"),
|
("django_mailbox2", "0005_auto_20160523_2240"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
@ -6,7 +6,7 @@ from django.db import migrations
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("django_mailbox", "0006_mailbox_last_polling"),
|
("django_mailbox2", "0006_mailbox_last_polling"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
@ -6,7 +6,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("django_mailbox", "0007_auto_20180421_0026"),
|
("django_mailbox2", "0007_auto_20180421_0026"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
@ -6,7 +6,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("django_mailbox", "0008_auto_20190219_1553"),
|
("django_mailbox2", "0008_auto_20190219_1553"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Models declaration for application ``django_mailbox``.
|
Models declaration for application ``django_mailbox2``.
|
||||||
"""
|
"""
|
||||||
import gzip
|
import gzip
|
||||||
from email.encoders import encode_base64
|
from email.encoders import encode_base64
|
||||||
|
|
@ -28,9 +28,9 @@ from django.db import models
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from django.utils.timezone import now
|
from django.utils.timezone import now
|
||||||
|
|
||||||
from django_mailbox import utils
|
from django_mailbox2 import utils
|
||||||
from django_mailbox.signals import message_received
|
from django_mailbox2.signals import message_received
|
||||||
from django_mailbox.transports import (
|
from django_mailbox2.transports import (
|
||||||
Pop3Transport,
|
Pop3Transport,
|
||||||
ImapTransport,
|
ImapTransport,
|
||||||
MaildirTransport,
|
MaildirTransport,
|
||||||
|
|
@ -215,7 +215,7 @@ class Mailbox(models.Model):
|
||||||
"""Returns the transport instance for this mailbox.
|
"""Returns the transport instance for this mailbox.
|
||||||
|
|
||||||
These will always be instances of
|
These will always be instances of
|
||||||
`django_mailbox.transports.base.EmailTransport`.
|
`django_mailbox2.transports.base.EmailTransport`.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
if not self.uri:
|
if not self.uri:
|
||||||
|
|
@ -480,7 +480,7 @@ class Message(models.Model):
|
||||||
)
|
)
|
||||||
|
|
||||||
in_reply_to = models.ForeignKey(
|
in_reply_to = models.ForeignKey(
|
||||||
"django_mailbox.Message",
|
"django_mailbox2.Message",
|
||||||
related_name="replies",
|
related_name="replies",
|
||||||
blank=True,
|
blank=True,
|
||||||
null=True,
|
null=True,
|
||||||
|
|
@ -8,24 +8,24 @@ class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Adding model 'Mailbox'
|
# Adding model 'Mailbox'
|
||||||
db.create_table(
|
db.create_table(
|
||||||
"django_mailbox_mailbox",
|
"django_mailbox2_mailbox",
|
||||||
(
|
(
|
||||||
("id", self.gf("django.db.models.fields.AutoField")(primary_key=True)),
|
("id", self.gf("django.db.models.fields.AutoField")(primary_key=True)),
|
||||||
("name", self.gf("django.db.models.fields.CharField")(max_length=255)),
|
("name", self.gf("django.db.models.fields.CharField")(max_length=255)),
|
||||||
("uri", self.gf("django.db.models.fields.CharField")(max_length=255)),
|
("uri", self.gf("django.db.models.fields.CharField")(max_length=255)),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
db.send_create_signal("django_mailbox", ["Mailbox"])
|
db.send_create_signal("django_mailbox2", ["Mailbox"])
|
||||||
|
|
||||||
# Adding model 'Message'
|
# Adding model 'Message'
|
||||||
db.create_table(
|
db.create_table(
|
||||||
"django_mailbox_message",
|
"django_mailbox2_message",
|
||||||
(
|
(
|
||||||
("id", self.gf("django.db.models.fields.AutoField")(primary_key=True)),
|
("id", self.gf("django.db.models.fields.AutoField")(primary_key=True)),
|
||||||
(
|
(
|
||||||
"mailbox",
|
"mailbox",
|
||||||
self.gf("django.db.models.fields.related.ForeignKey")(
|
self.gf("django.db.models.fields.related.ForeignKey")(
|
||||||
to=orm["django_mailbox.Mailbox"]
|
to=orm["django_mailbox2.Mailbox"]
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
|
|
@ -49,23 +49,23 @@ class Migration(SchemaMigration):
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
db.send_create_signal("django_mailbox", ["Message"])
|
db.send_create_signal("django_mailbox2", ["Message"])
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
# Deleting model 'Mailbox'
|
# Deleting model 'Mailbox'
|
||||||
db.delete_table("django_mailbox_mailbox")
|
db.delete_table("django_mailbox2_mailbox")
|
||||||
|
|
||||||
# Deleting model 'Message'
|
# Deleting model 'Message'
|
||||||
db.delete_table("django_mailbox_message")
|
db.delete_table("django_mailbox2_message")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
||||||
"name": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"name": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
"uri": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"uri": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"from_address": (
|
"from_address": (
|
||||||
|
|
@ -77,7 +77,7 @@ class Migration(SchemaMigration):
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"to": "orm['django_mailbox.Mailbox']"},
|
{"to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -93,4 +93,4 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -9,7 +9,7 @@ class Migration(SchemaMigration):
|
||||||
|
|
||||||
# Changing field 'Mailbox.uri'
|
# Changing field 'Mailbox.uri'
|
||||||
db.alter_column(
|
db.alter_column(
|
||||||
"django_mailbox_mailbox",
|
"django_mailbox2_mailbox",
|
||||||
"uri",
|
"uri",
|
||||||
self.gf("django.db.models.fields.CharField")(max_length=255, null=True),
|
self.gf("django.db.models.fields.CharField")(max_length=255, null=True),
|
||||||
)
|
)
|
||||||
|
|
@ -22,7 +22,7 @@ class Migration(SchemaMigration):
|
||||||
)
|
)
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
||||||
"name": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"name": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
|
|
@ -37,7 +37,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"from_address": (
|
"from_address": (
|
||||||
|
|
@ -49,7 +49,7 @@ class Migration(SchemaMigration):
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -65,4 +65,4 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -8,7 +8,7 @@ class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Adding field 'Mailbox.active'
|
# Adding field 'Mailbox.active'
|
||||||
db.add_column(
|
db.add_column(
|
||||||
"django_mailbox_mailbox",
|
"django_mailbox2_mailbox",
|
||||||
"active",
|
"active",
|
||||||
self.gf("django.db.models.fields.BooleanField")(default=True),
|
self.gf("django.db.models.fields.BooleanField")(default=True),
|
||||||
keep_default=False,
|
keep_default=False,
|
||||||
|
|
@ -16,10 +16,10 @@ class Migration(SchemaMigration):
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
# Deleting field 'Mailbox.active'
|
# Deleting field 'Mailbox.active'
|
||||||
db.delete_column("django_mailbox_mailbox", "active")
|
db.delete_column("django_mailbox2_mailbox", "active")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
||||||
|
|
@ -35,7 +35,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"from_address": (
|
"from_address": (
|
||||||
|
|
@ -47,7 +47,7 @@ class Migration(SchemaMigration):
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -63,4 +63,4 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -8,7 +8,7 @@ class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Adding field 'Message.outgoing'
|
# Adding field 'Message.outgoing'
|
||||||
db.add_column(
|
db.add_column(
|
||||||
"django_mailbox_message",
|
"django_mailbox2_message",
|
||||||
"outgoing",
|
"outgoing",
|
||||||
self.gf("django.db.models.fields.BooleanField")(default=False),
|
self.gf("django.db.models.fields.BooleanField")(default=False),
|
||||||
keep_default=False,
|
keep_default=False,
|
||||||
|
|
@ -16,10 +16,10 @@ class Migration(SchemaMigration):
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
# Deleting field 'Message.outgoing'
|
# Deleting field 'Message.outgoing'
|
||||||
db.delete_column("django_mailbox_message", "outgoing")
|
db.delete_column("django_mailbox2_message", "outgoing")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
||||||
|
|
@ -35,7 +35,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"from_address": (
|
"from_address": (
|
||||||
|
|
@ -47,7 +47,7 @@ class Migration(SchemaMigration):
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -68,4 +68,4 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -6,15 +6,15 @@ from django.db import models
|
||||||
|
|
||||||
class Migration(SchemaMigration):
|
class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
db.rename_column("django_mailbox_message", "from_address", "address")
|
db.rename_column("django_mailbox2_message", "from_address", "address")
|
||||||
db.rename_column("django_mailbox_message", "received", "processed")
|
db.rename_column("django_mailbox2_message", "received", "processed")
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
db.rename_column("django_mailbox_message", "address", "from_address")
|
db.rename_column("django_mailbox2_message", "address", "from_address")
|
||||||
db.rename_column("django_mailbox_message", "processed", "received")
|
db.rename_column("django_mailbox2_message", "processed", "received")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
||||||
|
|
@ -30,7 +30,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"address": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"address": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
|
|
@ -38,7 +38,7 @@ class Migration(SchemaMigration):
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -59,4 +59,4 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -8,20 +8,20 @@ class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Adding field 'Message.in_reply_to'
|
# Adding field 'Message.in_reply_to'
|
||||||
db.add_column(
|
db.add_column(
|
||||||
"django_mailbox_message",
|
"django_mailbox2_message",
|
||||||
"in_reply_to",
|
"in_reply_to",
|
||||||
self.gf("django.db.models.fields.related.ForeignKey")(
|
self.gf("django.db.models.fields.related.ForeignKey")(
|
||||||
blank=True,
|
blank=True,
|
||||||
related_name="replies",
|
related_name="replies",
|
||||||
null=True,
|
null=True,
|
||||||
to=orm["django_mailbox.Message"],
|
to=orm["django_mailbox2.Message"],
|
||||||
),
|
),
|
||||||
keep_default=False,
|
keep_default=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Adding M2M table for field references on 'Message'
|
# Adding M2M table for field references on 'Message'
|
||||||
db.create_table(
|
db.create_table(
|
||||||
"django_mailbox_message_references",
|
"django_mailbox2_message_references",
|
||||||
(
|
(
|
||||||
(
|
(
|
||||||
"id",
|
"id",
|
||||||
|
|
@ -31,27 +31,27 @@ class Migration(SchemaMigration):
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"from_message",
|
"from_message",
|
||||||
models.ForeignKey(orm["django_mailbox.message"], null=False),
|
models.ForeignKey(orm["django_mailbox2.message"], null=False),
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"to_message",
|
"to_message",
|
||||||
models.ForeignKey(orm["django_mailbox.message"], null=False),
|
models.ForeignKey(orm["django_mailbox2.message"], null=False),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
db.create_unique(
|
db.create_unique(
|
||||||
"django_mailbox_message_references", ["from_message_id", "to_message_id"]
|
"django_mailbox2_message_references", ["from_message_id", "to_message_id"]
|
||||||
)
|
)
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
# Deleting field 'Message.in_reply_to'
|
# Deleting field 'Message.in_reply_to'
|
||||||
db.delete_column("django_mailbox_message", "in_reply_to_id")
|
db.delete_column("django_mailbox2_message", "in_reply_to_id")
|
||||||
|
|
||||||
# Removing M2M table for field references on 'Message'
|
# Removing M2M table for field references on 'Message'
|
||||||
db.delete_table("django_mailbox_message_references")
|
db.delete_table("django_mailbox2_message_references")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
||||||
|
|
@ -67,7 +67,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"address": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"address": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
|
|
@ -79,13 +79,13 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -110,11 +110,11 @@ class Migration(SchemaMigration):
|
||||||
"related_name": "'referenced_by'",
|
"related_name": "'referenced_by'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"symmetrical": "False",
|
"symmetrical": "False",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -7,11 +7,11 @@ from django.db import models
|
||||||
class Migration(SchemaMigration):
|
class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Deleting field 'Message.address'
|
# Deleting field 'Message.address'
|
||||||
db.delete_column("django_mailbox_message", "address")
|
db.delete_column("django_mailbox2_message", "address")
|
||||||
|
|
||||||
# Adding field 'Message.from_header'
|
# Adding field 'Message.from_header'
|
||||||
db.add_column(
|
db.add_column(
|
||||||
"django_mailbox_message",
|
"django_mailbox2_message",
|
||||||
"from_header",
|
"from_header",
|
||||||
self.gf("django.db.models.fields.CharField")(default="", max_length=255),
|
self.gf("django.db.models.fields.CharField")(default="", max_length=255),
|
||||||
keep_default=False,
|
keep_default=False,
|
||||||
|
|
@ -19,7 +19,7 @@ class Migration(SchemaMigration):
|
||||||
|
|
||||||
# Adding field 'Message.to_header'
|
# Adding field 'Message.to_header'
|
||||||
db.add_column(
|
db.add_column(
|
||||||
"django_mailbox_message",
|
"django_mailbox2_message",
|
||||||
"to_header",
|
"to_header",
|
||||||
self.gf("django.db.models.fields.TextField")(default=""),
|
self.gf("django.db.models.fields.TextField")(default=""),
|
||||||
keep_default=False,
|
keep_default=False,
|
||||||
|
|
@ -32,13 +32,13 @@ class Migration(SchemaMigration):
|
||||||
"Cannot reverse this migration. 'Message.address' and its values cannot be restored."
|
"Cannot reverse this migration. 'Message.address' and its values cannot be restored."
|
||||||
)
|
)
|
||||||
# Deleting field 'Message.from_header'
|
# Deleting field 'Message.from_header'
|
||||||
db.delete_column("django_mailbox_message", "from_header")
|
db.delete_column("django_mailbox2_message", "from_header")
|
||||||
|
|
||||||
# Deleting field 'Message.to_header'
|
# Deleting field 'Message.to_header'
|
||||||
db.delete_column("django_mailbox_message", "to_header")
|
db.delete_column("django_mailbox2_message", "to_header")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
||||||
|
|
@ -54,7 +54,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"from_header": (
|
"from_header": (
|
||||||
|
|
@ -70,13 +70,13 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -101,7 +101,7 @@ class Migration(SchemaMigration):
|
||||||
"related_name": "'referenced_by'",
|
"related_name": "'referenced_by'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"symmetrical": "False",
|
"symmetrical": "False",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
|
|
@ -109,4 +109,4 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -7,7 +7,7 @@ from django.db import models
|
||||||
|
|
||||||
class Migration(DataMigration):
|
class Migration(DataMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
for message in orm["django_mailbox.message"].objects.all():
|
for message in orm["django_mailbox2.message"].objects.all():
|
||||||
msg_object = email.message_from_string(message.body)
|
msg_object = email.message_from_string(message.body)
|
||||||
message.from_header = msg_object["from"]
|
message.from_header = msg_object["from"]
|
||||||
message.to_header = msg_object["to"]
|
message.to_header = msg_object["to"]
|
||||||
|
|
@ -17,7 +17,7 @@ class Migration(DataMigration):
|
||||||
raise RuntimeError("Cannot reverse this migration.")
|
raise RuntimeError("Cannot reverse this migration.")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
||||||
|
|
@ -33,7 +33,7 @@ class Migration(DataMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"from_header": (
|
"from_header": (
|
||||||
|
|
@ -49,13 +49,13 @@ class Migration(DataMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -80,7 +80,7 @@ class Migration(DataMigration):
|
||||||
"related_name": "'referenced_by'",
|
"related_name": "'referenced_by'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"symmetrical": "False",
|
"symmetrical": "False",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
|
|
@ -88,5 +88,5 @@ class Migration(DataMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
symmetrical = True
|
symmetrical = True
|
||||||
|
|
@ -7,12 +7,12 @@ from django.db import models
|
||||||
class Migration(SchemaMigration):
|
class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Removing M2M table for field references on 'Message'
|
# Removing M2M table for field references on 'Message'
|
||||||
db.delete_table("django_mailbox_message_references")
|
db.delete_table("django_mailbox2_message_references")
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
# Adding M2M table for field references on 'Message'
|
# Adding M2M table for field references on 'Message'
|
||||||
db.create_table(
|
db.create_table(
|
||||||
"django_mailbox_message_references",
|
"django_mailbox2_message_references",
|
||||||
(
|
(
|
||||||
(
|
(
|
||||||
"id",
|
"id",
|
||||||
|
|
@ -22,20 +22,20 @@ class Migration(SchemaMigration):
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"from_message",
|
"from_message",
|
||||||
models.ForeignKey(orm["django_mailbox.message"], null=False),
|
models.ForeignKey(orm["django_mailbox2.message"], null=False),
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"to_message",
|
"to_message",
|
||||||
models.ForeignKey(orm["django_mailbox.message"], null=False),
|
models.ForeignKey(orm["django_mailbox2.message"], null=False),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
db.create_unique(
|
db.create_unique(
|
||||||
"django_mailbox_message_references", ["from_message_id", "to_message_id"]
|
"django_mailbox2_message_references", ["from_message_id", "to_message_id"]
|
||||||
)
|
)
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
|
||||||
|
|
@ -51,7 +51,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"from_header": (
|
"from_header": (
|
||||||
|
|
@ -67,13 +67,13 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -95,4 +95,4 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -8,7 +8,7 @@ class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Adding field 'Mailbox.from_email'
|
# Adding field 'Mailbox.from_email'
|
||||||
db.add_column(
|
db.add_column(
|
||||||
"django_mailbox_mailbox",
|
"django_mailbox2_mailbox",
|
||||||
"from_email",
|
"from_email",
|
||||||
self.gf("django.db.models.fields.CharField")(
|
self.gf("django.db.models.fields.CharField")(
|
||||||
default=None, max_length=255, null=True, blank=True
|
default=None, max_length=255, null=True, blank=True
|
||||||
|
|
@ -18,10 +18,10 @@ class Migration(SchemaMigration):
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
# Deleting field 'Mailbox.from_email'
|
# Deleting field 'Mailbox.from_email'
|
||||||
db.delete_column("django_mailbox_mailbox", "from_email")
|
db.delete_column("django_mailbox2_mailbox", "from_email")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"from_email": (
|
"from_email": (
|
||||||
|
|
@ -47,7 +47,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"from_header": (
|
"from_header": (
|
||||||
|
|
@ -63,13 +63,13 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -91,4 +91,4 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -8,7 +8,7 @@ class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Adding field 'Message.read'
|
# Adding field 'Message.read'
|
||||||
db.add_column(
|
db.add_column(
|
||||||
"django_mailbox_message",
|
"django_mailbox2_message",
|
||||||
"read",
|
"read",
|
||||||
self.gf("django.db.models.fields.DateTimeField")(
|
self.gf("django.db.models.fields.DateTimeField")(
|
||||||
default=None, null=True, blank=True
|
default=None, null=True, blank=True
|
||||||
|
|
@ -18,10 +18,10 @@ class Migration(SchemaMigration):
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
# Deleting field 'Message.read'
|
# Deleting field 'Message.read'
|
||||||
db.delete_column("django_mailbox_message", "read")
|
db.delete_column("django_mailbox2_message", "read")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"from_email": (
|
"from_email": (
|
||||||
|
|
@ -47,7 +47,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"from_header": (
|
"from_header": (
|
||||||
|
|
@ -63,13 +63,13 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -96,4 +96,4 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -9,7 +9,7 @@ class Migration(SchemaMigration):
|
||||||
|
|
||||||
# Adding model 'MessageAttachment'
|
# Adding model 'MessageAttachment'
|
||||||
db.create_table(
|
db.create_table(
|
||||||
"django_mailbox_messageattachment",
|
"django_mailbox2_messageattachment",
|
||||||
(
|
(
|
||||||
("id", self.gf("django.db.models.fields.AutoField")(primary_key=True)),
|
("id", self.gf("django.db.models.fields.AutoField")(primary_key=True)),
|
||||||
(
|
(
|
||||||
|
|
@ -18,11 +18,11 @@ class Migration(SchemaMigration):
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
db.send_create_signal("django_mailbox", ["MessageAttachment"])
|
db.send_create_signal("django_mailbox2", ["MessageAttachment"])
|
||||||
|
|
||||||
# Adding M2M table for field attachments on 'Message'
|
# Adding M2M table for field attachments on 'Message'
|
||||||
db.create_table(
|
db.create_table(
|
||||||
"django_mailbox_message_attachments",
|
"django_mailbox2_message_attachments",
|
||||||
(
|
(
|
||||||
(
|
(
|
||||||
"id",
|
"id",
|
||||||
|
|
@ -32,30 +32,31 @@ class Migration(SchemaMigration):
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"message",
|
"message",
|
||||||
models.ForeignKey(orm["django_mailbox.message"], null=False),
|
models.ForeignKey(orm["django_mailbox2.message"], null=False),
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"messageattachment",
|
"messageattachment",
|
||||||
models.ForeignKey(
|
models.ForeignKey(
|
||||||
orm["django_mailbox.messageattachment"], null=False
|
orm["django_mailbox2.messageattachment"], null=False
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
db.create_unique(
|
db.create_unique(
|
||||||
"django_mailbox_message_attachments", ["message_id", "messageattachment_id"]
|
"django_mailbox2_message_attachments",
|
||||||
|
["message_id", "messageattachment_id"],
|
||||||
)
|
)
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
|
|
||||||
# Deleting model 'MessageAttachment'
|
# Deleting model 'MessageAttachment'
|
||||||
db.delete_table("django_mailbox_messageattachment")
|
db.delete_table("django_mailbox2_messageattachment")
|
||||||
|
|
||||||
# Removing M2M table for field attachments on 'Message'
|
# Removing M2M table for field attachments on 'Message'
|
||||||
db.delete_table("django_mailbox_message_attachments")
|
db.delete_table("django_mailbox2_message_attachments")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"from_email": (
|
"from_email": (
|
||||||
|
|
@ -81,13 +82,13 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"attachments": (
|
"attachments": (
|
||||||
"django.db.models.fields.related.ManyToManyField",
|
"django.db.models.fields.related.ManyToManyField",
|
||||||
[],
|
[],
|
||||||
{
|
{
|
||||||
"to": "orm['django_mailbox.MessageAttachment']",
|
"to": "orm['django_mailbox2.MessageAttachment']",
|
||||||
"symmetrical": "False",
|
"symmetrical": "False",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|
@ -105,13 +106,13 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -136,7 +137,7 @@ class Migration(SchemaMigration):
|
||||||
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
"to_header": ("django.db.models.fields.TextField", [], {}),
|
"to_header": ("django.db.models.fields.TextField", [], {}),
|
||||||
},
|
},
|
||||||
"django_mailbox.messageattachment": {
|
"django_mailbox2.messageattachment": {
|
||||||
"Meta": {"object_name": "MessageAttachment"},
|
"Meta": {"object_name": "MessageAttachment"},
|
||||||
"document": (
|
"document": (
|
||||||
"django.db.models.fields.files.FileField",
|
"django.db.models.fields.files.FileField",
|
||||||
|
|
@ -147,4 +148,4 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -8,23 +8,23 @@ class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Adding field 'MessageAttachment.message'
|
# Adding field 'MessageAttachment.message'
|
||||||
db.add_column(
|
db.add_column(
|
||||||
"django_mailbox_messageattachment",
|
"django_mailbox2_messageattachment",
|
||||||
"message",
|
"message",
|
||||||
self.gf("django.db.models.fields.related.ForeignKey")(
|
self.gf("django.db.models.fields.related.ForeignKey")(
|
||||||
blank=True,
|
blank=True,
|
||||||
related_name="attachments",
|
related_name="attachments",
|
||||||
null=True,
|
null=True,
|
||||||
to=orm["django_mailbox.Message"],
|
to=orm["django_mailbox2.Message"],
|
||||||
),
|
),
|
||||||
keep_default=False,
|
keep_default=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
# Deleting field 'MessageAttachment.message'
|
# Deleting field 'MessageAttachment.message'
|
||||||
db.delete_column("django_mailbox_messageattachment", "message_id")
|
db.delete_column("django_mailbox2_messageattachment", "message_id")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"from_email": (
|
"from_email": (
|
||||||
|
|
@ -50,7 +50,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"attachments": (
|
"attachments": (
|
||||||
"django.db.models.fields.related.ManyToManyField",
|
"django.db.models.fields.related.ManyToManyField",
|
||||||
|
|
@ -59,7 +59,7 @@ class Migration(SchemaMigration):
|
||||||
"symmetrical": "False",
|
"symmetrical": "False",
|
||||||
"related_name": "'messages_old'",
|
"related_name": "'messages_old'",
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"to": "orm['django_mailbox.MessageAttachment']",
|
"to": "orm['django_mailbox2.MessageAttachment']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
|
|
@ -76,13 +76,13 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -107,7 +107,7 @@ class Migration(SchemaMigration):
|
||||||
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
"to_header": ("django.db.models.fields.TextField", [], {}),
|
"to_header": ("django.db.models.fields.TextField", [], {}),
|
||||||
},
|
},
|
||||||
"django_mailbox.messageattachment": {
|
"django_mailbox2.messageattachment": {
|
||||||
"Meta": {"object_name": "MessageAttachment"},
|
"Meta": {"object_name": "MessageAttachment"},
|
||||||
"document": (
|
"document": (
|
||||||
"django.db.models.fields.files.FileField",
|
"django.db.models.fields.files.FileField",
|
||||||
|
|
@ -122,10 +122,10 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'attachments_new'",
|
"related_name": "'attachments_new'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -8,18 +8,18 @@ class Migration(SchemaMigration):
|
||||||
no_dry_run = True
|
no_dry_run = True
|
||||||
|
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
for message in orm["django_mailbox.Message"].objects.all():
|
for message in orm["django_mailbox2.Message"].objects.all():
|
||||||
for attachment in message.attachments.all():
|
for attachment in message.attachments.all():
|
||||||
attachment.message = message
|
attachment.message = message
|
||||||
attachment.save()
|
attachment.save()
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
for attachment in orm["django_mailbox.MessageAttachment"].objects.all():
|
for attachment in orm["django_mailbox2.MessageAttachment"].objects.all():
|
||||||
if attachment.message:
|
if attachment.message:
|
||||||
attachment.message.attachments.add(attachment)
|
attachment.message.attachments.add(attachment)
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"from_email": (
|
"from_email": (
|
||||||
|
|
@ -45,7 +45,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"attachments": (
|
"attachments": (
|
||||||
"django.db.models.fields.related.ManyToManyField",
|
"django.db.models.fields.related.ManyToManyField",
|
||||||
|
|
@ -54,7 +54,7 @@ class Migration(SchemaMigration):
|
||||||
"symmetrical": "False",
|
"symmetrical": "False",
|
||||||
"related_name": "'messages_old'",
|
"related_name": "'messages_old'",
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"to": "orm['django_mailbox.MessageAttachment']",
|
"to": "orm['django_mailbox2.MessageAttachment']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
|
|
@ -71,13 +71,13 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -102,7 +102,7 @@ class Migration(SchemaMigration):
|
||||||
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
"to_header": ("django.db.models.fields.TextField", [], {}),
|
"to_header": ("django.db.models.fields.TextField", [], {}),
|
||||||
},
|
},
|
||||||
"django_mailbox.messageattachment": {
|
"django_mailbox2.messageattachment": {
|
||||||
"Meta": {"object_name": "MessageAttachment"},
|
"Meta": {"object_name": "MessageAttachment"},
|
||||||
"document": (
|
"document": (
|
||||||
"django.db.models.fields.files.FileField",
|
"django.db.models.fields.files.FileField",
|
||||||
|
|
@ -117,10 +117,10 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'attachments_new'",
|
"related_name": "'attachments_new'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -7,11 +7,11 @@ from django.db import models
|
||||||
class Migration(SchemaMigration):
|
class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Removing M2M table for field attachments on 'Message'
|
# Removing M2M table for field attachments on 'Message'
|
||||||
db.delete_table("django_mailbox_message_attachments")
|
db.delete_table("django_mailbox2_message_attachments")
|
||||||
|
|
||||||
# Adding field 'MessageAttachment.headers'
|
# Adding field 'MessageAttachment.headers'
|
||||||
db.add_column(
|
db.add_column(
|
||||||
"django_mailbox_messageattachment",
|
"django_mailbox2_messageattachment",
|
||||||
"headers",
|
"headers",
|
||||||
self.gf("django.db.models.fields.TextField")(null=True, blank=True),
|
self.gf("django.db.models.fields.TextField")(null=True, blank=True),
|
||||||
keep_default=False,
|
keep_default=False,
|
||||||
|
|
@ -20,7 +20,7 @@ class Migration(SchemaMigration):
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
# Adding M2M table for field attachments on 'Message'
|
# Adding M2M table for field attachments on 'Message'
|
||||||
db.create_table(
|
db.create_table(
|
||||||
"django_mailbox_message_attachments",
|
"django_mailbox2_message_attachments",
|
||||||
(
|
(
|
||||||
(
|
(
|
||||||
"id",
|
"id",
|
||||||
|
|
@ -30,25 +30,26 @@ class Migration(SchemaMigration):
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"message",
|
"message",
|
||||||
models.ForeignKey(orm["django_mailbox.message"], null=False),
|
models.ForeignKey(orm["django_mailbox2.message"], null=False),
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"messageattachment",
|
"messageattachment",
|
||||||
models.ForeignKey(
|
models.ForeignKey(
|
||||||
orm["django_mailbox.messageattachment"], null=False
|
orm["django_mailbox2.messageattachment"], null=False
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
db.create_unique(
|
db.create_unique(
|
||||||
"django_mailbox_message_attachments", ["message_id", "messageattachment_id"]
|
"django_mailbox2_message_attachments",
|
||||||
|
["message_id", "messageattachment_id"],
|
||||||
)
|
)
|
||||||
|
|
||||||
# Deleting field 'MessageAttachment.headers'
|
# Deleting field 'MessageAttachment.headers'
|
||||||
db.delete_column("django_mailbox_messageattachment", "headers")
|
db.delete_column("django_mailbox2_messageattachment", "headers")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"from_email": (
|
"from_email": (
|
||||||
|
|
@ -74,7 +75,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"from_header": (
|
"from_header": (
|
||||||
|
|
@ -90,13 +91,13 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -121,7 +122,7 @@ class Migration(SchemaMigration):
|
||||||
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
"to_header": ("django.db.models.fields.TextField", [], {}),
|
"to_header": ("django.db.models.fields.TextField", [], {}),
|
||||||
},
|
},
|
||||||
"django_mailbox.messageattachment": {
|
"django_mailbox2.messageattachment": {
|
||||||
"Meta": {"object_name": "MessageAttachment"},
|
"Meta": {"object_name": "MessageAttachment"},
|
||||||
"document": (
|
"document": (
|
||||||
"django.db.models.fields.files.FileField",
|
"django.db.models.fields.files.FileField",
|
||||||
|
|
@ -141,10 +142,10 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'attachments'",
|
"related_name": "'attachments'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -8,7 +8,7 @@ class Migration(SchemaMigration):
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
# Adding field 'Message.encoded'
|
# Adding field 'Message.encoded'
|
||||||
db.add_column(
|
db.add_column(
|
||||||
"django_mailbox_message",
|
"django_mailbox2_message",
|
||||||
"encoded",
|
"encoded",
|
||||||
self.gf("django.db.models.fields.BooleanField")(default=False),
|
self.gf("django.db.models.fields.BooleanField")(default=False),
|
||||||
keep_default=False,
|
keep_default=False,
|
||||||
|
|
@ -16,10 +16,10 @@ class Migration(SchemaMigration):
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
# Deleting field 'Message.encoded'
|
# Deleting field 'Message.encoded'
|
||||||
db.delete_column("django_mailbox_message", "encoded")
|
db.delete_column("django_mailbox2_message", "encoded")
|
||||||
|
|
||||||
models = {
|
models = {
|
||||||
"django_mailbox.mailbox": {
|
"django_mailbox2.mailbox": {
|
||||||
"Meta": {"object_name": "Mailbox"},
|
"Meta": {"object_name": "Mailbox"},
|
||||||
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
|
||||||
"from_email": (
|
"from_email": (
|
||||||
|
|
@ -45,7 +45,7 @@ class Migration(SchemaMigration):
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
"django_mailbox.message": {
|
"django_mailbox2.message": {
|
||||||
"Meta": {"object_name": "Message"},
|
"Meta": {"object_name": "Message"},
|
||||||
"body": ("django.db.models.fields.TextField", [], {}),
|
"body": ("django.db.models.fields.TextField", [], {}),
|
||||||
"encoded": (
|
"encoded": (
|
||||||
|
|
@ -66,13 +66,13 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'replies'",
|
"related_name": "'replies'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
"mailbox": (
|
"mailbox": (
|
||||||
"django.db.models.fields.related.ForeignKey",
|
"django.db.models.fields.related.ForeignKey",
|
||||||
[],
|
[],
|
||||||
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
|
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
|
||||||
),
|
),
|
||||||
"message_id": (
|
"message_id": (
|
||||||
"django.db.models.fields.CharField",
|
"django.db.models.fields.CharField",
|
||||||
|
|
@ -97,7 +97,7 @@ class Migration(SchemaMigration):
|
||||||
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
|
||||||
"to_header": ("django.db.models.fields.TextField", [], {}),
|
"to_header": ("django.db.models.fields.TextField", [], {}),
|
||||||
},
|
},
|
||||||
"django_mailbox.messageattachment": {
|
"django_mailbox2.messageattachment": {
|
||||||
"Meta": {"object_name": "MessageAttachment"},
|
"Meta": {"object_name": "MessageAttachment"},
|
||||||
"document": (
|
"document": (
|
||||||
"django.db.models.fields.files.FileField",
|
"django.db.models.fields.files.FileField",
|
||||||
|
|
@ -117,10 +117,10 @@ class Migration(SchemaMigration):
|
||||||
"blank": "True",
|
"blank": "True",
|
||||||
"related_name": "'attachments'",
|
"related_name": "'attachments'",
|
||||||
"null": "True",
|
"null": "True",
|
||||||
"to": "orm['django_mailbox.Message']",
|
"to": "orm['django_mailbox2.Message']",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ["django_mailbox"]
|
complete_apps = ["django_mailbox2"]
|
||||||
|
|
@ -5,8 +5,8 @@ import time
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from django_mailbox import models, utils
|
from django_mailbox2 import models, utils
|
||||||
from django_mailbox.models import Mailbox, Message
|
from django_mailbox2.models import Mailbox, Message
|
||||||
|
|
||||||
|
|
||||||
class EmailIntegrationTimeout(Exception):
|
class EmailIntegrationTimeout(Exception):
|
||||||
|
|
@ -7,6 +7,6 @@ DATABASES = {
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
"django.contrib.auth",
|
"django.contrib.auth",
|
||||||
"django.contrib.contenttypes",
|
"django.contrib.contenttypes",
|
||||||
"django_mailbox",
|
"django_mailbox2",
|
||||||
]
|
]
|
||||||
SECRET_KEY = "beepboop"
|
SECRET_KEY = "beepboop"
|
||||||
|
|
@ -4,8 +4,8 @@ from urllib import parse
|
||||||
|
|
||||||
from django.core.mail import EmailMultiAlternatives
|
from django.core.mail import EmailMultiAlternatives
|
||||||
|
|
||||||
from django_mailbox.models import Mailbox
|
from django_mailbox2.models import Mailbox
|
||||||
from django_mailbox.tests.base import EmailMessageTestCase
|
from django_mailbox2.tests.base import EmailMessageTestCase
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["TestImap"]
|
__all__ = ["TestImap"]
|
||||||
|
|
@ -2,7 +2,7 @@ import os
|
||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from django_mailbox.models import Mailbox
|
from django_mailbox2.models import Mailbox
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["TestMailbox"]
|
__all__ = ["TestMailbox"]
|
||||||
|
|
@ -2,9 +2,9 @@ import copy
|
||||||
|
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from django_mailbox import models, utils
|
from django_mailbox2 import models, utils
|
||||||
from django_mailbox.models import Message
|
from django_mailbox2.models import Message
|
||||||
from django_mailbox.tests.base import EmailMessageTestCase
|
from django_mailbox2.tests.base import EmailMessageTestCase
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["TestMessageFlattening"]
|
__all__ = ["TestMessageFlattening"]
|
||||||
|
|
@ -81,7 +81,7 @@ class TestMessageFlattening(EmailMessageTestCase):
|
||||||
)
|
)
|
||||||
default_settings = utils.get_settings()
|
default_settings = utils.get_settings()
|
||||||
|
|
||||||
with mock.patch("django_mailbox.utils.get_settings") as get_settings:
|
with mock.patch("django_mailbox2.utils.get_settings") as get_settings:
|
||||||
altered = copy.deepcopy(default_settings)
|
altered = copy.deepcopy(default_settings)
|
||||||
altered["strip_unallowed_mimetypes"] = True
|
altered["strip_unallowed_mimetypes"] = True
|
||||||
altered["allowed_mimetypes"] = ["text/plain"]
|
altered["allowed_mimetypes"] = ["text/plain"]
|
||||||
|
|
@ -6,10 +6,10 @@ import os.path
|
||||||
import copy
|
import copy
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from django_mailbox.models import Mailbox, Message
|
from django_mailbox2.models import Mailbox, Message
|
||||||
from django_mailbox.utils import convert_header_to_unicode
|
from django_mailbox2.utils import convert_header_to_unicode
|
||||||
from django_mailbox import utils
|
from django_mailbox2 import utils
|
||||||
from django_mailbox.tests.base import EmailMessageTestCase
|
from django_mailbox2.tests.base import EmailMessageTestCase
|
||||||
from django.utils.encoding import force_str
|
from django.utils.encoding import force_str
|
||||||
from django.core.mail import EmailMessage
|
from django.core.mail import EmailMessage
|
||||||
|
|
||||||
|
|
@ -358,7 +358,7 @@ class TestProcessEmail(EmailMessageTestCase):
|
||||||
|
|
||||||
default_settings = utils.get_settings()
|
default_settings = utils.get_settings()
|
||||||
|
|
||||||
with mock.patch("django_mailbox.utils.get_settings") as get_settings:
|
with mock.patch("django_mailbox2.utils.get_settings") as get_settings:
|
||||||
altered = copy.deepcopy(default_settings)
|
altered = copy.deepcopy(default_settings)
|
||||||
altered["store_original_message"] = True
|
altered["store_original_message"] = True
|
||||||
get_settings.return_value = altered
|
get_settings.return_value = altered
|
||||||
|
|
@ -377,7 +377,7 @@ class TestProcessEmail(EmailMessageTestCase):
|
||||||
|
|
||||||
default_settings = utils.get_settings()
|
default_settings = utils.get_settings()
|
||||||
|
|
||||||
with mock.patch("django_mailbox.utils.get_settings") as get_settings:
|
with mock.patch("django_mailbox2.utils.get_settings") as get_settings:
|
||||||
altered = copy.deepcopy(default_settings)
|
altered = copy.deepcopy(default_settings)
|
||||||
altered["store_original_message"] = False
|
altered["store_original_message"] = False
|
||||||
get_settings.return_value = altered
|
get_settings.return_value = altered
|
||||||
|
|
@ -391,7 +391,7 @@ class TestProcessEmail(EmailMessageTestCase):
|
||||||
|
|
||||||
default_settings = utils.get_settings()
|
default_settings = utils.get_settings()
|
||||||
|
|
||||||
with mock.patch("django_mailbox.utils.get_settings") as get_settings:
|
with mock.patch("django_mailbox2.utils.get_settings") as get_settings:
|
||||||
altered = copy.deepcopy(default_settings)
|
altered = copy.deepcopy(default_settings)
|
||||||
altered["compress_original_message"] = True
|
altered["compress_original_message"] = True
|
||||||
altered["store_original_message"] = True
|
altered["store_original_message"] = True
|
||||||
|
|
@ -14,7 +14,7 @@ class CommandsTestCase(TestCase):
|
||||||
# Mock handle so that the test doesn't hang waiting for input. Note that we are only testing
|
# Mock handle so that the test doesn't hang waiting for input. Note that we are only testing
|
||||||
# the argument parsing here -- functionality should be tested elsewhere
|
# the argument parsing here -- functionality should be tested elsewhere
|
||||||
with mock.patch(
|
with mock.patch(
|
||||||
"django_mailbox.management.commands.processincomingmessage.Command.handle"
|
"django_mailbox2.management.commands.processincomingmessage.Command.handle"
|
||||||
) as handle:
|
) as handle:
|
||||||
# Don't care about the return value
|
# Don't care about the return value
|
||||||
handle.return_value = None
|
handle.return_value = None
|
||||||
|
|
@ -38,7 +38,7 @@ class CommandsTestCase(TestCase):
|
||||||
mailbox_name = "foo_mailbox"
|
mailbox_name = "foo_mailbox"
|
||||||
|
|
||||||
with mock.patch(
|
with mock.patch(
|
||||||
"django_mailbox.management.commands.processincomingmessage.Command.handle"
|
"django_mailbox2.management.commands.processincomingmessage.Command.handle"
|
||||||
) as handle:
|
) as handle:
|
||||||
handle.return_value = None
|
handle.return_value = None
|
||||||
|
|
||||||
|
|
@ -3,8 +3,8 @@ from os.path import exists
|
||||||
from os import remove
|
from os import remove
|
||||||
from django.test.utils import override_settings
|
from django.test.utils import override_settings
|
||||||
|
|
||||||
from django_mailbox.tests.base import EmailMessageTestCase, get_email_as_text
|
from django_mailbox2.tests.base import EmailMessageTestCase, get_email_as_text
|
||||||
from django_mailbox.transports import ImapTransport, Pop3Transport
|
from django_mailbox2.transports import ImapTransport, Pop3Transport
|
||||||
|
|
||||||
FAKE_UID_SEARCH_ANSWER = (
|
FAKE_UID_SEARCH_ANSWER = (
|
||||||
"OK",
|
"OK",
|
||||||
10
django_mailbox2/transports/__init__.py
Normal file
10
django_mailbox2/transports/__init__.py
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
# all imports below are only used by external modules
|
||||||
|
# flake8: noqa
|
||||||
|
from django_mailbox2.transports.imap import ImapTransport
|
||||||
|
from django_mailbox2.transports.pop3 import Pop3Transport
|
||||||
|
from django_mailbox2.transports.maildir import MaildirTransport
|
||||||
|
from django_mailbox2.transports.mbox import MboxTransport
|
||||||
|
from django_mailbox2.transports.babyl import BabylTransport
|
||||||
|
from django_mailbox2.transports.mh import MHTransport
|
||||||
|
from django_mailbox2.transports.mmdf import MMDFTransport
|
||||||
|
from django_mailbox2.transports.gmail import GmailImapTransport
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
from mailbox import Babyl
|
from mailbox import Babyl
|
||||||
from django_mailbox.transports.generic import GenericFileMailbox
|
from django_mailbox2.transports.generic import GenericFileMailbox
|
||||||
|
|
||||||
|
|
||||||
class BabylTransport(GenericFileMailbox):
|
class BabylTransport(GenericFileMailbox):
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from django_mailbox.transports.imap import ImapTransport
|
from django_mailbox2.transports.imap import ImapTransport
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
from mailbox import Maildir
|
from mailbox import Maildir
|
||||||
from django_mailbox.transports.generic import GenericFileMailbox
|
from django_mailbox2.transports.generic import GenericFileMailbox
|
||||||
|
|
||||||
|
|
||||||
class MaildirTransport(GenericFileMailbox):
|
class MaildirTransport(GenericFileMailbox):
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
from mailbox import mbox
|
from mailbox import mbox
|
||||||
from django_mailbox.transports.generic import GenericFileMailbox
|
from django_mailbox2.transports.generic import GenericFileMailbox
|
||||||
|
|
||||||
|
|
||||||
class MboxTransport(GenericFileMailbox):
|
class MboxTransport(GenericFileMailbox):
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
from mailbox import MH
|
from mailbox import MH
|
||||||
from django_mailbox.transports.generic import GenericFileMailbox
|
from django_mailbox2.transports.generic import GenericFileMailbox
|
||||||
|
|
||||||
|
|
||||||
class MHTransport(GenericFileMailbox):
|
class MHTransport(GenericFileMailbox):
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
from mailbox import MMDF
|
from mailbox import MMDF
|
||||||
from django_mailbox.transports.generic import GenericFileMailbox
|
from django_mailbox2.transports.generic import GenericFileMailbox
|
||||||
|
|
||||||
|
|
||||||
class MMDFTransport(GenericFileMailbox):
|
class MMDFTransport(GenericFileMailbox):
|
||||||
1
version_updater.json
Normal file
1
version_updater.json
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
[{"name": "Makefile", "searchStr": "VERSION :=", "formatStr": "VERSION := {0}\n"}, {"name": "tests/test_django-mailbox2.py", "searchStr": " assert __version__", "formatStr": " assert __version__ == \"{0}\"\n"}, {"name": "django-mailbox2/__init__.py", "searchStr": "__version__ =", "formatStr": "__version__ = \"{0}\"\n"}]
|
||||||
Loading…
Add table
Add a link
Reference in a new issue