Commit d68b6a21 authored by Barry Warsaw's avatar Barry Warsaw

Merge branch 'issue135' of gitlab.com:warsaw/mailman into issue135

parents 4188b533 2f6a9c1f
......@@ -99,7 +99,6 @@ case second `m'. Any other spelling is incorrect.""",
'httplib2',
'lazr.config',
'lazr.smtptest',
'mock',
'nose2',
'passlib',
'sqlalchemy',
......
......@@ -25,8 +25,8 @@ __all__ = [
import unittest
from io import StringIO
from mock import patch
from mailman.bin.mailman import main
from unittest.mock import patch
......
......@@ -24,13 +24,13 @@ __all__ = [
import os
import sys
import mock
import tempfile
import unittest
from io import StringIO
from mailman.commands.cli_conf import Conf
from mailman.testing.layers import ConfigLayer
from unittest import mock
......
......@@ -27,8 +27,8 @@ import unittest
from mailman.app.lifecycle import create_list
from mailman.commands.cli_import import Import21
from mailman.testing.layers import ConfigLayer
from mock import patch
from pkg_resources import resource_filename
from unittest.mock import patch
......
......@@ -25,7 +25,6 @@ __all__ = [
import os
import mock
import tempfile
import unittest
......@@ -37,6 +36,7 @@ from mailman.interfaces.configuration import (
from mailman.testing.helpers import configuration, event_subscribers
from mailman.testing.layers import ConfigLayer
from pkg_resources import resource_filename
from unittest import mock
......
......@@ -17,10 +17,10 @@ import sqlalchemy as sa
def upgrade():
op.create_table('workflowstate',
sa.Column('name', sa.Unicode(), nullable=False),
sa.Column('key', sa.Unicode(), nullable=False),
sa.Column('token', sa.Unicode(), nullable=False),
sa.Column('step', sa.Unicode(), nullable=True),
sa.Column('data', sa.Unicode(), nullable=True),
sa.PrimaryKeyConstraint('name', 'key')
sa.PrimaryKeyConstraint('name', 'token')
)
......
......@@ -31,10 +31,10 @@ from mailman.database.factory import LAST_STORM_SCHEMA_VERSION, SchemaManager
from mailman.database.model import Model
from mailman.interfaces.database import DatabaseError
from mailman.testing.layers import ConfigLayer
from mock import patch
from sqlalchemy import MetaData, Table, Column, Integer, Unicode
from sqlalchemy.exc import ProgrammingError, OperationalError
from sqlalchemy.schema import Index
from unittest.mock import patch
......
......@@ -37,6 +37,7 @@ Bugs
backported smtpd module which can accept non-UTF-8 data. (Closes #140)
* Bulk emails are now decorated with headers and footers. Given by Aurélien
Bompard. (Closes #145)
* Core no longer depends on the standalone `mock` module. (Closes: #146)
Configuration
-------------
......
......@@ -23,7 +23,6 @@ __all__ = [
]
import mock
import socket
import nntplib
import unittest
......@@ -36,6 +35,7 @@ from mailman.testing.helpers import (
LogFileMark, configuration, get_queue_messages, make_testable_runner,
specialized_message_from_string as mfs)
from mailman.testing.layers import ConfigLayer
from unittest import mock
......
......@@ -40,7 +40,6 @@ __all__ = [
import os
import json
import mock
import time
import uuid
import errno
......@@ -67,6 +66,7 @@ from mailman.interfaces.styles import IStyleManager
from mailman.interfaces.usermanager import IUserManager
from mailman.runners.digest import DigestRunner
from mailman.utilities.mailbox import Mailbox
from unittest import mock
from urllib.error import HTTPError
from urllib.parse import urlencode
from zope import event
......
......@@ -29,7 +29,6 @@ __all__ = [
import os
import mock
import unittest
from datetime import timedelta, datetime
......@@ -56,6 +55,7 @@ from mailman.utilities.importer import import_config_pck, Import21Error
from mailman.utilities.string import expand
from pickle import load
from pkg_resources import resource_filename
from unittest import mock
from zope.component import getUtility
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment