mirror/django-mailbox
1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-10 06:48:19 +02:00
Code Activity

adds updated module name

Browse source
This commit is contained in:
Joe 2021-02-08 23:39:19 -05:00
parent 5177ea5c65
commit d94faeeee7
50 changed files with 224 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.flake8
View file

@ -1,4 +1,4 @@
[flake8]
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

5
CHANGELOG.md
View file

@ -5,7 +5,10 @@ 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.
## [0.1.3] - 2021-02-07
## [0.1.3] - 2021-02-08
### Added
- adds updated module name
### Changed
- changes main directory to mailbox2

4
django_mailbox2/__init__.py
View file

@ -1,3 +1,3 @@
__version__ = "4.8.2"
__version__ = "0.1.3"
default_app_config = "django_mailbox.apps.MailBoxConfig"
default_app_config = "django_mailbox2.apps.MailBoxConfig"

8
django_mailbox2/admin.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
Model configuration in application ``django_mailbox`` for administration
Model configuration in application ``django_mailbox2`` for administration
console.
"""
@ -11,9 +11,9 @@ from django.conf import settings
from django.contrib import admin
from django.utils.translation import gettext_lazy as _
from django_mailbox.models import MessageAttachment, Message, Mailbox
from django_mailbox.signals import message_received
from django_mailbox.utils import convert_header_to_unicode
from django_mailbox2.models import MessageAttachment, Message, Mailbox
from django_mailbox2.signals import message_received
from django_mailbox2.utils import convert_header_to_unicode
logger = logging.getLogger(__name__)

4
django_mailbox2/apps.py
View file

@ -3,5 +3,5 @@ from django.utils.translation import gettext_lazy as _
class MailBoxConfig(AppConfig):
name = "django_mailbox"
verbose_name = _("Mail Box")
name = "django_mailbox2"
verbose_name = _("Mail Box 2")

2
django_mailbox2/management/commands/getmail.py
View file

@ -2,7 +2,7 @@ import logging
from django.core.management.base import BaseCommand
from django_mailbox.models import Mailbox
from django_mailbox2.models import Mailbox
logger = logging.getLogger(__name__)

2
django_mailbox2/management/commands/processincomingmessage.py
View file

@ -9,7 +9,7 @@ except ImportError:
from django.core.management.base import BaseCommand
from django_mailbox.models import Mailbox
from django_mailbox2.models import Mailbox
logger = logging.getLogger(__name__)

2
django_mailbox2/management/commands/rebuildmessageattachments.py
View file

@ -4,7 +4,7 @@ import logging
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__)
logging.basicConfig(level=logging.INFO)

6
django_mailbox2/migrations/0001_initial.py
View file

@ -106,7 +106,7 @@ class Migration(migrations.Migration):
related_name="replies",
verbose_name="In reply to",
blank=True,
to="django_mailbox.Message",
to="django_mailbox2.Message",
null=True,
on_delete=models.CASCADE,
),
@ -116,7 +116,7 @@ class Migration(migrations.Migration):
models.ForeignKey(
related_name="messages",
verbose_name="Mailbox",
to="django_mailbox.Mailbox",
to="django_mailbox2.Mailbox",
on_delete=models.CASCADE,
),
),
@ -153,7 +153,7 @@ class Migration(migrations.Migration):
related_name="attachments",
verbose_name="Message",
blank=True,
to="django_mailbox.Message",
to="django_mailbox2.Message",
null=True,
on_delete=models.CASCADE,
),

2
django_mailbox2/migrations/0002_add_eml_to_message.py
View file

@ -4,7 +4,7 @@ from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
("django_mailbox", "0001_initial"),
("django_mailbox2", "0001_initial"),
]
operations = [

2
django_mailbox2/migrations/0003_auto_20150409_0316.py
View file

@ -4,7 +4,7 @@ from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
("django_mailbox", "0002_add_eml_to_message"),
("django_mailbox2", "0002_add_eml_to_message"),
]
operations = [

2
django_mailbox2/migrations/0004_bytestring_to_unicode.py
View file

@ -4,7 +4,7 @@ from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
("django_mailbox", "0003_auto_20150409_0316"),
("django_mailbox2", "0003_auto_20150409_0316"),
]
operations = [

6
django_mailbox2/migrations/0005_auto_20160523_2240.py
View file

@ -1,11 +1,11 @@
from django.db import migrations, models
import django_mailbox.utils
import django_mailbox2.utils
class Migration(migrations.Migration):
dependencies = [
("django_mailbox", "0004_bytestring_to_unicode"),
("django_mailbox2", "0004_bytestring_to_unicode"),
]
operations = [
@ -13,7 +13,7 @@ class Migration(migrations.Migration):
model_name="messageattachment",
name="document",
field=models.FileField(
upload_to=django_mailbox.utils.get_attachment_save_path,
upload_to=django_mailbox2.utils.get_attachment_save_path,
verbose_name="Document",
),
),

2
django_mailbox2/migrations/0006_mailbox_last_polling.py
View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("django_mailbox", "0005_auto_20160523_2240"),
("django_mailbox2", "0005_auto_20160523_2240"),
]
operations = [

2
django_mailbox2/migrations/0007_auto_20180421_0026.py
View file

@ -6,7 +6,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("django_mailbox", "0006_mailbox_last_polling"),
("django_mailbox2", "0006_mailbox_last_polling"),
]
operations = [

2
django_mailbox2/migrations/0008_auto_20190219_1553.py
View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("django_mailbox", "0007_auto_20180421_0026"),
("django_mailbox2", "0007_auto_20180421_0026"),
]
operations = [

2
django_mailbox2/migrations/0009_auto_20210207_0221.py
View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("django_mailbox", "0008_auto_20190219_1553"),
("django_mailbox2", "0008_auto_20190219_1553"),
]
operations = [

12
django_mailbox2/models.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
Models declaration for application ``django_mailbox``.
Models declaration for application ``django_mailbox2``.
"""
import gzip
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.timezone import now
from django_mailbox import utils
from django_mailbox.signals import message_received
from django_mailbox.transports import (
from django_mailbox2 import utils
from django_mailbox2.signals import message_received
from django_mailbox2.transports import (
Pop3Transport,
ImapTransport,
MaildirTransport,
@ -215,7 +215,7 @@ class Mailbox(models.Model):
"""Returns the transport instance for this mailbox.
These will always be instances of
`django_mailbox.transports.base.EmailTransport`.
`django_mailbox2.transports.base.EmailTransport`.
"""
if not self.uri:
@ -480,7 +480,7 @@ class Message(models.Model):
)
in_reply_to = models.ForeignKey(
"django_mailbox.Message",
"django_mailbox2.Message",
related_name="replies",
blank=True,
null=True,

22
django_mailbox2/south_migrations/0001_initial.py
View file

@ -8,24 +8,24 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Adding model 'Mailbox'
db.create_table(
"django_mailbox_mailbox",
"django_mailbox2_mailbox",
(
("id", self.gf("django.db.models.fields.AutoField")(primary_key=True)),
("name", 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'
db.create_table(
"django_mailbox_message",
"django_mailbox2_message",
(
("id", self.gf("django.db.models.fields.AutoField")(primary_key=True)),
(
"mailbox",
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):
# Deleting model 'Mailbox'
db.delete_table("django_mailbox_mailbox")
db.delete_table("django_mailbox2_mailbox")
# Deleting model 'Message'
db.delete_table("django_mailbox_message")
db.delete_table("django_mailbox2_message")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
"name": ("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"},
"body": ("django.db.models.fields.TextField", [], {}),
"from_address": (
@ -77,7 +77,7 @@ class Migration(SchemaMigration):
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"to": "orm['django_mailbox.Mailbox']"},
{"to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -93,4 +93,4 @@ class Migration(SchemaMigration):
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

10
django_mailbox2/south_migrations/0002_auto__chg_field_mailbox_uri.py
View file

@ -9,7 +9,7 @@ class Migration(SchemaMigration):
# Changing field 'Mailbox.uri'
db.alter_column(
"django_mailbox_mailbox",
"django_mailbox2_mailbox",
"uri",
self.gf("django.db.models.fields.CharField")(max_length=255, null=True),
)
@ -22,7 +22,7 @@ class Migration(SchemaMigration):
)
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"id": ("django.db.models.fields.AutoField", [], {"primary_key": "True"}),
"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"},
"body": ("django.db.models.fields.TextField", [], {}),
"from_address": (
@ -49,7 +49,7 @@ class Migration(SchemaMigration):
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -65,4 +65,4 @@ class Migration(SchemaMigration):
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

12
django_mailbox2/south_migrations/0003_auto__add_field_mailbox_active.py
View file

@ -8,7 +8,7 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'Mailbox.active'
db.add_column(
"django_mailbox_mailbox",
"django_mailbox2_mailbox",
"active",
self.gf("django.db.models.fields.BooleanField")(default=True),
keep_default=False,
@ -16,10 +16,10 @@ class Migration(SchemaMigration):
def backwards(self, orm):
# Deleting field 'Mailbox.active'
db.delete_column("django_mailbox_mailbox", "active")
db.delete_column("django_mailbox2_mailbox", "active")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "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"},
"body": ("django.db.models.fields.TextField", [], {}),
"from_address": (
@ -47,7 +47,7 @@ class Migration(SchemaMigration):
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -63,4 +63,4 @@ class Migration(SchemaMigration):
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

12
django_mailbox2/south_migrations/0004_auto__add_field_message_outgoing.py
View file

@ -8,7 +8,7 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'Message.outgoing'
db.add_column(
"django_mailbox_message",
"django_mailbox2_message",
"outgoing",
self.gf("django.db.models.fields.BooleanField")(default=False),
keep_default=False,
@ -16,10 +16,10 @@ class Migration(SchemaMigration):
def backwards(self, orm):
# Deleting field 'Message.outgoing'
db.delete_column("django_mailbox_message", "outgoing")
db.delete_column("django_mailbox2_message", "outgoing")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "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"},
"body": ("django.db.models.fields.TextField", [], {}),
"from_address": (
@ -47,7 +47,7 @@ class Migration(SchemaMigration):
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -68,4 +68,4 @@ class Migration(SchemaMigration):
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

16
django_mailbox2/south_migrations/0005_rename_fields.py
View file

@ -6,15 +6,15 @@ from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
db.rename_column("django_mailbox_message", "from_address", "address")
db.rename_column("django_mailbox_message", "received", "processed")
db.rename_column("django_mailbox2_message", "from_address", "address")
db.rename_column("django_mailbox2_message", "received", "processed")
def backwards(self, orm):
db.rename_column("django_mailbox_message", "address", "from_address")
db.rename_column("django_mailbox_message", "processed", "received")
db.rename_column("django_mailbox2_message", "address", "from_address")
db.rename_column("django_mailbox2_message", "processed", "received")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "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"},
"address": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
"body": ("django.db.models.fields.TextField", [], {}),
@ -38,7 +38,7 @@ class Migration(SchemaMigration):
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -59,4 +59,4 @@ class Migration(SchemaMigration):
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

28
django_mailbox2/south_migrations/0006_auto__add_field_message_in_reply_to.py
View file

@ -8,20 +8,20 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'Message.in_reply_to'
db.add_column(
"django_mailbox_message",
"django_mailbox2_message",
"in_reply_to",
self.gf("django.db.models.fields.related.ForeignKey")(
blank=True,
related_name="replies",
null=True,
to=orm["django_mailbox.Message"],
to=orm["django_mailbox2.Message"],
),
keep_default=False,
)
# Adding M2M table for field references on 'Message'
db.create_table(
"django_mailbox_message_references",
"django_mailbox2_message_references",
(
(
"id",
@ -31,27 +31,27 @@ class Migration(SchemaMigration):
),
(
"from_message",
models.ForeignKey(orm["django_mailbox.message"], null=False),
models.ForeignKey(orm["django_mailbox2.message"], null=False),
),
(
"to_message",
models.ForeignKey(orm["django_mailbox.message"], null=False),
models.ForeignKey(orm["django_mailbox2.message"], null=False),
),
),
)
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):
# 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'
db.delete_table("django_mailbox_message_references")
db.delete_table("django_mailbox2_message_references")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "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"},
"address": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
"body": ("django.db.models.fields.TextField", [], {}),
@ -79,13 +79,13 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -110,11 +110,11 @@ class Migration(SchemaMigration):
"related_name": "'referenced_by'",
"null": "True",
"symmetrical": "False",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

22
django_mailbox2/south_migrations/0007_auto__del_field_message_address__add_field_message_from_header__add_fi.py
View file

@ -7,11 +7,11 @@ from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Deleting field 'Message.address'
db.delete_column("django_mailbox_message", "address")
db.delete_column("django_mailbox2_message", "address")
# Adding field 'Message.from_header'
db.add_column(
"django_mailbox_message",
"django_mailbox2_message",
"from_header",
self.gf("django.db.models.fields.CharField")(default="", max_length=255),
keep_default=False,
@ -19,7 +19,7 @@ class Migration(SchemaMigration):
# Adding field 'Message.to_header'
db.add_column(
"django_mailbox_message",
"django_mailbox2_message",
"to_header",
self.gf("django.db.models.fields.TextField")(default=""),
keep_default=False,
@ -32,13 +32,13 @@ class Migration(SchemaMigration):
"Cannot reverse this migration. 'Message.address' and its values cannot be restored."
)
# 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'
db.delete_column("django_mailbox_message", "to_header")
db.delete_column("django_mailbox2_message", "to_header")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "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"},
"body": ("django.db.models.fields.TextField", [], {}),
"from_header": (
@ -70,13 +70,13 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -101,7 +101,7 @@ class Migration(SchemaMigration):
"related_name": "'referenced_by'",
"null": "True",
"symmetrical": "False",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
@ -109,4 +109,4 @@ class Migration(SchemaMigration):
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

14
django_mailbox2/south_migrations/0008_populate_from_to_fields.py
View file

@ -7,7 +7,7 @@ from django.db import models
class Migration(DataMigration):
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)
message.from_header = msg_object["from"]
message.to_header = msg_object["to"]
@ -17,7 +17,7 @@ class Migration(DataMigration):
raise RuntimeError("Cannot reverse this migration.")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "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"},
"body": ("django.db.models.fields.TextField", [], {}),
"from_header": (
@ -49,13 +49,13 @@ class Migration(DataMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -80,7 +80,7 @@ class Migration(DataMigration):
"related_name": "'referenced_by'",
"null": "True",
"symmetrical": "False",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"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

20
django_mailbox2/south_migrations/0009_remove_references_table.py
View file

@ -7,12 +7,12 @@ from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# 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):
# Adding M2M table for field references on 'Message'
db.create_table(
"django_mailbox_message_references",
"django_mailbox2_message_references",
(
(
"id",
@ -22,20 +22,20 @@ class Migration(SchemaMigration):
),
(
"from_message",
models.ForeignKey(orm["django_mailbox.message"], null=False),
models.ForeignKey(orm["django_mailbox2.message"], null=False),
),
(
"to_message",
models.ForeignKey(orm["django_mailbox.message"], null=False),
models.ForeignKey(orm["django_mailbox2.message"], null=False),
),
),
)
db.create_unique(
"django_mailbox_message_references", ["from_message_id", "to_message_id"]
"django_mailbox2_message_references", ["from_message_id", "to_message_id"]
)
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "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"},
"body": ("django.db.models.fields.TextField", [], {}),
"from_header": (
@ -67,13 +67,13 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -95,4 +95,4 @@ class Migration(SchemaMigration):
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

14
django_mailbox2/south_migrations/0010_auto__add_field_mailbox_from_email.py
View file

@ -8,7 +8,7 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'Mailbox.from_email'
db.add_column(
"django_mailbox_mailbox",
"django_mailbox2_mailbox",
"from_email",
self.gf("django.db.models.fields.CharField")(
default=None, max_length=255, null=True, blank=True
@ -18,10 +18,10 @@ class Migration(SchemaMigration):
def backwards(self, orm):
# Deleting field 'Mailbox.from_email'
db.delete_column("django_mailbox_mailbox", "from_email")
db.delete_column("django_mailbox2_mailbox", "from_email")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
"from_email": (
@ -47,7 +47,7 @@ class Migration(SchemaMigration):
},
),
},
"django_mailbox.message": {
"django_mailbox2.message": {
"Meta": {"object_name": "Message"},
"body": ("django.db.models.fields.TextField", [], {}),
"from_header": (
@ -63,13 +63,13 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -91,4 +91,4 @@ class Migration(SchemaMigration):
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

14
django_mailbox2/south_migrations/0011_auto__add_field_message_read.py
View file

@ -8,7 +8,7 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'Message.read'
db.add_column(
"django_mailbox_message",
"django_mailbox2_message",
"read",
self.gf("django.db.models.fields.DateTimeField")(
default=None, null=True, blank=True
@ -18,10 +18,10 @@ class Migration(SchemaMigration):
def backwards(self, orm):
# Deleting field 'Message.read'
db.delete_column("django_mailbox_message", "read")
db.delete_column("django_mailbox2_message", "read")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
"from_email": (
@ -47,7 +47,7 @@ class Migration(SchemaMigration):
},
),
},
"django_mailbox.message": {
"django_mailbox2.message": {
"Meta": {"object_name": "Message"},
"body": ("django.db.models.fields.TextField", [], {}),
"from_header": (
@ -63,13 +63,13 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -96,4 +96,4 @@ class Migration(SchemaMigration):
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

31
django_mailbox2/south_migrations/0012_auto__add_messageattachment.py
View file

@ -9,7 +9,7 @@ class Migration(SchemaMigration):
# Adding model 'MessageAttachment'
db.create_table(
"django_mailbox_messageattachment",
"django_mailbox2_messageattachment",
(
("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'
db.create_table(
"django_mailbox_message_attachments",
"django_mailbox2_message_attachments",
(
(
"id",
@ -32,30 +32,31 @@ class Migration(SchemaMigration):
),
(
"message",
models.ForeignKey(orm["django_mailbox.message"], null=False),
models.ForeignKey(orm["django_mailbox2.message"], null=False),
),
(
"messageattachment",
models.ForeignKey(
orm["django_mailbox.messageattachment"], null=False
orm["django_mailbox2.messageattachment"], null=False
),
),
),
)
db.create_unique(
"django_mailbox_message_attachments", ["message_id", "messageattachment_id"]
"django_mailbox2_message_attachments",
["message_id", "messageattachment_id"],
)
def backwards(self, orm):
# Deleting model 'MessageAttachment'
db.delete_table("django_mailbox_messageattachment")
db.delete_table("django_mailbox2_messageattachment")
# Removing M2M table for field attachments on 'Message'
db.delete_table("django_mailbox_message_attachments")
db.delete_table("django_mailbox2_message_attachments")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
"from_email": (
@ -81,13 +82,13 @@ class Migration(SchemaMigration):
},
),
},
"django_mailbox.message": {
"django_mailbox2.message": {
"Meta": {"object_name": "Message"},
"attachments": (
"django.db.models.fields.related.ManyToManyField",
[],
{
"to": "orm['django_mailbox.MessageAttachment']",
"to": "orm['django_mailbox2.MessageAttachment']",
"symmetrical": "False",
},
),
@ -105,13 +106,13 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -136,7 +137,7 @@ class Migration(SchemaMigration):
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
"to_header": ("django.db.models.fields.TextField", [], {}),
},
"django_mailbox.messageattachment": {
"django_mailbox2.messageattachment": {
"Meta": {"object_name": "MessageAttachment"},
"document": (
"django.db.models.fields.files.FileField",
@ -147,4 +148,4 @@ class Migration(SchemaMigration):
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

22
django_mailbox2/south_migrations/0013_auto__add_field_messageattachment_message.py
View file

@ -8,23 +8,23 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'MessageAttachment.message'
db.add_column(
"django_mailbox_messageattachment",
"django_mailbox2_messageattachment",
"message",
self.gf("django.db.models.fields.related.ForeignKey")(
blank=True,
related_name="attachments",
null=True,
to=orm["django_mailbox.Message"],
to=orm["django_mailbox2.Message"],
),
keep_default=False,
)
def backwards(self, orm):
# Deleting field 'MessageAttachment.message'
db.delete_column("django_mailbox_messageattachment", "message_id")
db.delete_column("django_mailbox2_messageattachment", "message_id")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
"from_email": (
@ -50,7 +50,7 @@ class Migration(SchemaMigration):
},
),
},
"django_mailbox.message": {
"django_mailbox2.message": {
"Meta": {"object_name": "Message"},
"attachments": (
"django.db.models.fields.related.ManyToManyField",
@ -59,7 +59,7 @@ class Migration(SchemaMigration):
"symmetrical": "False",
"related_name": "'messages_old'",
"blank": "True",
"to": "orm['django_mailbox.MessageAttachment']",
"to": "orm['django_mailbox2.MessageAttachment']",
},
),
"body": ("django.db.models.fields.TextField", [], {}),
@ -76,13 +76,13 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -107,7 +107,7 @@ class Migration(SchemaMigration):
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
"to_header": ("django.db.models.fields.TextField", [], {}),
},
"django_mailbox.messageattachment": {
"django_mailbox2.messageattachment": {
"Meta": {"object_name": "MessageAttachment"},
"document": (
"django.db.models.fields.files.FileField",
@ -122,10 +122,10 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'attachments_new'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

20
django_mailbox2/south_migrations/0014_migrate_message_attachments.py
View file

@ -8,18 +8,18 @@ class Migration(SchemaMigration):
no_dry_run = True
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():
attachment.message = message
attachment.save()
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:
attachment.message.attachments.add(attachment)
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
"from_email": (
@ -45,7 +45,7 @@ class Migration(SchemaMigration):
},
),
},
"django_mailbox.message": {
"django_mailbox2.message": {
"Meta": {"object_name": "Message"},
"attachments": (
"django.db.models.fields.related.ManyToManyField",
@ -54,7 +54,7 @@ class Migration(SchemaMigration):
"symmetrical": "False",
"related_name": "'messages_old'",
"blank": "True",
"to": "orm['django_mailbox.MessageAttachment']",
"to": "orm['django_mailbox2.MessageAttachment']",
},
),
"body": ("django.db.models.fields.TextField", [], {}),
@ -71,13 +71,13 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -102,7 +102,7 @@ class Migration(SchemaMigration):
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
"to_header": ("django.db.models.fields.TextField", [], {}),
},
"django_mailbox.messageattachment": {
"django_mailbox2.messageattachment": {
"Meta": {"object_name": "MessageAttachment"},
"document": (
"django.db.models.fields.files.FileField",
@ -117,10 +117,10 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'attachments_new'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

29
django_mailbox2/south_migrations/0015_auto__add_field_messageattachment_headers.py
View file

@ -7,11 +7,11 @@ from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# 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'
db.add_column(
"django_mailbox_messageattachment",
"django_mailbox2_messageattachment",
"headers",
self.gf("django.db.models.fields.TextField")(null=True, blank=True),
keep_default=False,
@ -20,7 +20,7 @@ class Migration(SchemaMigration):
def backwards(self, orm):
# Adding M2M table for field attachments on 'Message'
db.create_table(
"django_mailbox_message_attachments",
"django_mailbox2_message_attachments",
(
(
"id",
@ -30,25 +30,26 @@ class Migration(SchemaMigration):
),
(
"message",
models.ForeignKey(orm["django_mailbox.message"], null=False),
models.ForeignKey(orm["django_mailbox2.message"], null=False),
),
(
"messageattachment",
models.ForeignKey(
orm["django_mailbox.messageattachment"], null=False
orm["django_mailbox2.messageattachment"], null=False
),
),
),
)
db.create_unique(
"django_mailbox_message_attachments", ["message_id", "messageattachment_id"]
"django_mailbox2_message_attachments",
["message_id", "messageattachment_id"],
)
# Deleting field 'MessageAttachment.headers'
db.delete_column("django_mailbox_messageattachment", "headers")
db.delete_column("django_mailbox2_messageattachment", "headers")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
"from_email": (
@ -74,7 +75,7 @@ class Migration(SchemaMigration):
},
),
},
"django_mailbox.message": {
"django_mailbox2.message": {
"Meta": {"object_name": "Message"},
"body": ("django.db.models.fields.TextField", [], {}),
"from_header": (
@ -90,13 +91,13 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -121,7 +122,7 @@ class Migration(SchemaMigration):
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
"to_header": ("django.db.models.fields.TextField", [], {}),
},
"django_mailbox.messageattachment": {
"django_mailbox2.messageattachment": {
"Meta": {"object_name": "MessageAttachment"},
"document": (
"django.db.models.fields.files.FileField",
@ -141,10 +142,10 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'attachments'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

18
django_mailbox2/south_migrations/0016_auto__add_field_message_encoded.py
View file

@ -8,7 +8,7 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'Message.encoded'
db.add_column(
"django_mailbox_message",
"django_mailbox2_message",
"encoded",
self.gf("django.db.models.fields.BooleanField")(default=False),
keep_default=False,
@ -16,10 +16,10 @@ class Migration(SchemaMigration):
def backwards(self, orm):
# Deleting field 'Message.encoded'
db.delete_column("django_mailbox_message", "encoded")
db.delete_column("django_mailbox2_message", "encoded")
models = {
"django_mailbox.mailbox": {
"django_mailbox2.mailbox": {
"Meta": {"object_name": "Mailbox"},
"active": ("django.db.models.fields.BooleanField", [], {"default": "True"}),
"from_email": (
@ -45,7 +45,7 @@ class Migration(SchemaMigration):
},
),
},
"django_mailbox.message": {
"django_mailbox2.message": {
"Meta": {"object_name": "Message"},
"body": ("django.db.models.fields.TextField", [], {}),
"encoded": (
@ -66,13 +66,13 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'replies'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
"mailbox": (
"django.db.models.fields.related.ForeignKey",
[],
{"related_name": "'messages'", "to": "orm['django_mailbox.Mailbox']"},
{"related_name": "'messages'", "to": "orm['django_mailbox2.Mailbox']"},
),
"message_id": (
"django.db.models.fields.CharField",
@ -97,7 +97,7 @@ class Migration(SchemaMigration):
"subject": ("django.db.models.fields.CharField", [], {"max_length": "255"}),
"to_header": ("django.db.models.fields.TextField", [], {}),
},
"django_mailbox.messageattachment": {
"django_mailbox2.messageattachment": {
"Meta": {"object_name": "MessageAttachment"},
"document": (
"django.db.models.fields.files.FileField",
@ -117,10 +117,10 @@ class Migration(SchemaMigration):
"blank": "True",
"related_name": "'attachments'",
"null": "True",
"to": "orm['django_mailbox.Message']",
"to": "orm['django_mailbox2.Message']",
},
),
},
}
complete_apps = ["django_mailbox"]
complete_apps = ["django_mailbox2"]

4
django_mailbox2/tests/base.py
View file

@ -5,8 +5,8 @@ import time
from django.conf import settings
from django.test import TestCase
from django_mailbox import models, utils
from django_mailbox.models import Mailbox, Message
from django_mailbox2 import models, utils
from django_mailbox2.models import Mailbox, Message
class EmailIntegrationTimeout(Exception):

2
django_mailbox2/tests/settings.py
View file

@ -7,6 +7,6 @@ DATABASES = {
INSTALLED_APPS = [
"django.contrib.auth",
"django.contrib.contenttypes",
"django_mailbox",
"django_mailbox2",
]
SECRET_KEY = "beepboop"

4
django_mailbox2/tests/test_integration_imap.py
View file

@ -4,8 +4,8 @@ from urllib import parse
from django.core.mail import EmailMultiAlternatives
from django_mailbox.models import Mailbox
from django_mailbox.tests.base import EmailMessageTestCase
from django_mailbox2.models import Mailbox
from django_mailbox2.tests.base import EmailMessageTestCase
__all__ = ["TestImap"]

2
django_mailbox2/tests/test_mailbox.py
View file

@ -2,7 +2,7 @@ import os
from django.test import TestCase
from django_mailbox.models import Mailbox
from django_mailbox2.models import Mailbox
__all__ = ["TestMailbox"]

8
django_mailbox2/tests/test_message_flattening.py
View file

@ -2,9 +2,9 @@ import copy
from unittest import mock
from django_mailbox import models, utils
from django_mailbox.models import Message
from django_mailbox.tests.base import EmailMessageTestCase
from django_mailbox2 import models, utils
from django_mailbox2.models import Message
from django_mailbox2.tests.base import EmailMessageTestCase
__all__ = ["TestMessageFlattening"]
@ -81,7 +81,7 @@ class TestMessageFlattening(EmailMessageTestCase):
)
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["strip_unallowed_mimetypes"] = True
altered["allowed_mimetypes"] = ["text/plain"]

14
django_mailbox2/tests/test_process_email.py
View file

@ -6,10 +6,10 @@ import os.path
import copy
from unittest import mock
from django_mailbox.models import Mailbox, Message
from django_mailbox.utils import convert_header_to_unicode
from django_mailbox import utils
from django_mailbox.tests.base import EmailMessageTestCase
from django_mailbox2.models import Mailbox, Message
from django_mailbox2.utils import convert_header_to_unicode
from django_mailbox2 import utils
from django_mailbox2.tests.base import EmailMessageTestCase
from django.utils.encoding import force_str
from django.core.mail import EmailMessage
@ -358,7 +358,7 @@ class TestProcessEmail(EmailMessageTestCase):
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["store_original_message"] = True
get_settings.return_value = altered
@ -377,7 +377,7 @@ class TestProcessEmail(EmailMessageTestCase):
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["store_original_message"] = False
get_settings.return_value = altered
@ -391,7 +391,7 @@ class TestProcessEmail(EmailMessageTestCase):
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["compress_original_message"] = True
altered["store_original_message"] = True

4
django_mailbox2/tests/test_processincomingmessage.py
View file

@ -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
# the argument parsing here -- functionality should be tested elsewhere
with mock.patch(
"django_mailbox.management.commands.processincomingmessage.Command.handle"
"django_mailbox2.management.commands.processincomingmessage.Command.handle"
) as handle:
# Don't care about the return value
handle.return_value = None
@ -38,7 +38,7 @@ class CommandsTestCase(TestCase):
mailbox_name = "foo_mailbox"
with mock.patch(
"django_mailbox.management.commands.processincomingmessage.Command.handle"
"django_mailbox2.management.commands.processincomingmessage.Command.handle"
) as handle:
handle.return_value = None

4
django_mailbox2/tests/test_transports.py
View file

@ -3,8 +3,8 @@ from os.path import exists
from os import remove
from django.test.utils import override_settings
from django_mailbox.tests.base import EmailMessageTestCase, get_email_as_text
from django_mailbox.transports import ImapTransport, Pop3Transport
from django_mailbox2.tests.base import EmailMessageTestCase, get_email_as_text
from django_mailbox2.transports import ImapTransport, Pop3Transport
FAKE_UID_SEARCH_ANSWER = (
"OK",

16
django_mailbox2/transports/__init__.py
View file

@ -1,10 +1,10 @@
# 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
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

2
django_mailbox2/transports/babyl.py
View file

@ -1,5 +1,5 @@
from mailbox import Babyl
from django_mailbox.transports.generic import GenericFileMailbox
from django_mailbox2.transports.generic import GenericFileMailbox
class BabylTransport(GenericFileMailbox):

2
django_mailbox2/transports/gmail.py
View file

@ -1,6 +1,6 @@
import logging
from django_mailbox.transports.imap import ImapTransport
from django_mailbox2.transports.imap import ImapTransport
logger = logging.getLogger(__name__)

2
django_mailbox2/transports/maildir.py
View file

@ -1,5 +1,5 @@
from mailbox import Maildir
from django_mailbox.transports.generic import GenericFileMailbox
from django_mailbox2.transports.generic import GenericFileMailbox
class MaildirTransport(GenericFileMailbox):

2
django_mailbox2/transports/mbox.py
View file

@ -1,5 +1,5 @@
from mailbox import mbox
from django_mailbox.transports.generic import GenericFileMailbox
from django_mailbox2.transports.generic import GenericFileMailbox
class MboxTransport(GenericFileMailbox):

2
django_mailbox2/transports/mh.py
View file

@ -1,5 +1,5 @@
from mailbox import MH
from django_mailbox.transports.generic import GenericFileMailbox
from django_mailbox2.transports.generic import GenericFileMailbox
class MHTransport(GenericFileMailbox):

2
django_mailbox2/transports/mmdf.py
View file

@ -1,5 +1,5 @@
from mailbox import MMDF
from django_mailbox.transports.generic import GenericFileMailbox
from django_mailbox2.transports.generic import GenericFileMailbox
class MMDFTransport(GenericFileMailbox):

1
version_updater.json Normal file
View 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"}]