From eeb61c7f1783e17f3901206ab197d20f7303c6d2 Mon Sep 17 00:00:00 2001

From: Andrey Bychkov <mrdrew@altlinux.org>

Date: Mon, 1 Jul 2019 12:57:33 +0300

Subject: [PATCH] fix import module 'importlib_resources'

---

 setup.py                                       | 1 -

 src/mailman/archiving/tests/test_mhonarc.py    | 2 +-

 src/mailman/bin/tests/test_mailman.py          | 2 +-

 src/mailman/bin/tests/test_master.py           | 2 +-

 src/mailman/chains/tests/test_hold.py          | 2 +-

 src/mailman/commands/docs/import.rst           | 2 +-

 src/mailman/commands/tests/test_cli_control.py | 2 +-

 src/mailman/commands/tests/test_cli_import.py  | 2 +-

 src/mailman/config/config.py                   | 2 +-

 src/mailman/config/tests/test_configuration.py | 2 +-

 src/mailman/core/initialize.py                 | 2 +-

 src/mailman/email/tests/test_message.py        | 2 +-

 src/mailman/handlers/tests/test_mimedel.py     | 2 +-

 src/mailman/plugins/docs/intro.rst             | 2 +-

 src/mailman/plugins/testing/layer.py           | 2 +-

 src/mailman/rules/dmarc.py                     | 2 +-

 src/mailman/rules/tests/test_dmarc.py          | 2 +-

 src/mailman/testing/i18n.py                    | 2 +-

 src/mailman/testing/layers.py                  | 2 +-

 src/mailman/utilities/i18n.py                  | 2 +-

 src/mailman/utilities/modules.py               | 2 +-

 src/mailman/utilities/tests/test_import.py     | 2 +-

 src/mailman/utilities/tests/test_modules.py    | 2 +-

 src/mailman/utilities/tests/test_templates.py  | 2 +-

 24 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/setup.py b/setup.py

index 2420421..9ffd32f 100644

--- a/setup.py

+++ b/setup.py

@@ -113,7 +113,6 @@ case second 'm'.  Any other spelling is incorrect.""",

         'flufl.bounce',

         'flufl.i18n>=2.0',

         'flufl.lock>=3.1',

-        'importlib_resources',

         'lazr.config',

         'passlib',

         'requests',

diff --git a/src/mailman/archiving/tests/test_mhonarc.py b/src/mailman/archiving/tests/test_mhonarc.py

index f51462e..77eb020 100644

--- a/src/mailman/archiving/tests/test_mhonarc.py

+++ b/src/mailman/archiving/tests/test_mhonarc.py

@@ -23,7 +23,7 @@ import shutil

 import tempfile

 import unittest

-from importlib_resources import path

+from importlib.resources import path

 from mailman.app.lifecycle import create_list

 from mailman.archiving.mhonarc import MHonArc

 from mailman.database.transaction import transaction

diff --git a/src/mailman/bin/tests/test_mailman.py b/src/mailman/bin/tests/test_mailman.py

index 23bb1e6..62ff7b3 100644

--- a/src/mailman/bin/tests/test_mailman.py

+++ b/src/mailman/bin/tests/test_mailman.py

@@ -21,7 +21,7 @@ import unittest

 from click.testing import CliRunner

 from datetime import timedelta

-from importlib_resources import path

+from importlib.resources import path

 from mailman.app.lifecycle import create_list

 from mailman.bin.mailman import main

 from mailman.config import config

diff --git a/src/mailman/bin/tests/test_master.py b/src/mailman/bin/tests/test_master.py

index 84a7694..a759164 100644

--- a/src/mailman/bin/tests/test_master.py

+++ b/src/mailman/bin/tests/test_master.py

@@ -25,7 +25,7 @@ from click.testing import CliRunner

 from contextlib import ExitStack, suppress

 from datetime import timedelta

 from flufl.lock import Lock, TimeOutError

-from importlib_resources import path

+from importlib.resources import path

 from io import StringIO

 from mailman.bin import master

 from mailman.config import config

diff --git a/src/mailman/chains/tests/test_hold.py b/src/mailman/chains/tests/test_hold.py

index 23cbde1..c9cb3c1 100644

--- a/src/mailman/chains/tests/test_hold.py

+++ b/src/mailman/chains/tests/test_hold.py

@@ -20,7 +20,7 @@

 import unittest

 from email import message_from_bytes as mfb

-from importlib_resources import read_binary

+from importlib.resources import read_binary

 from mailman.app.lifecycle import create_list

 from mailman.chains.builtin import BuiltInChain

 from mailman.chains.hold import HoldChain, autorespond_to_sender

diff --git a/src/mailman/commands/docs/import.rst b/src/mailman/commands/docs/import.rst

index 91849a5..af42d93 100644

--- a/src/mailman/commands/docs/import.rst

+++ b/src/mailman/commands/docs/import.rst

@@ -25,7 +25,7 @@ You must also specify a pickle file to import.

 Too bad the list doesn't exist.

-    >>> from importlib_resources import path

+    >>> from importlib.resources import path

     >>> with path('mailman.testing', 'config.pck') as pickle_path:

     ...     pickle_file = str(pickle_path)

     ...     command('mailman import21 import@example.com ' + pickle_file)

diff --git a/src/mailman/commands/tests/test_cli_control.py b/src/mailman/commands/tests/test_cli_control.py

index 576f5a0..1723634 100644

--- a/src/mailman/commands/tests/test_cli_control.py

+++ b/src/mailman/commands/tests/test_cli_control.py

@@ -29,7 +29,7 @@ from click.testing import CliRunner

 from contextlib import ExitStack, suppress

 from datetime import datetime, timedelta

 from flufl.lock import SEP

-from importlib_resources import path

+from importlib.resources import path

 from mailman.bin.master import WatcherState

 from mailman.commands.cli_control import reopen, restart, start

 from mailman.config import config

diff --git a/src/mailman/commands/tests/test_cli_import.py b/src/mailman/commands/tests/test_cli_import.py

index 44a8dfd..af9f144 100644

--- a/src/mailman/commands/tests/test_cli_import.py

+++ b/src/mailman/commands/tests/test_cli_import.py

@@ -21,7 +21,7 @@ import unittest

 from click.testing import CliRunner

 from contextlib import ExitStack

-from importlib_resources import path

+from importlib.resources import path

 from mailman.app.lifecycle import create_list

 from mailman.commands.cli_import import import21

 from mailman.testing.layers import ConfigLayer

diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py

index 003183c..44d6874 100644

--- a/src/mailman/config/config.py

+++ b/src/mailman/config/config.py

@@ -24,7 +24,7 @@ import mailman.templates

 from configparser import ConfigParser

 from contextlib import ExitStack

 from flufl.lock import Lock

-from importlib_resources import path, read_text

+from importlib.resources import path, read_text

 from lazr.config import ConfigSchema, as_boolean

 from mailman import version

 from mailman.interfaces.configuration import (

diff --git a/src/mailman/config/tests/test_configuration.py b/src/mailman/config/tests/test_configuration.py

index 42c23ec..24cb5cc 100644

--- a/src/mailman/config/tests/test_configuration.py

+++ b/src/mailman/config/tests/test_configuration.py

@@ -21,7 +21,7 @@ import os

 import unittest

 from contextlib import ExitStack

-from importlib_resources import path

+from importlib.resources import path

 from mailman.config.config import (

     Configuration, external_configuration, load_external)

 from mailman.interfaces.configuration import (

diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py

index 690c13f..7ace2ff 100644

--- a/src/mailman/core/initialize.py

+++ b/src/mailman/core/initialize.py

@@ -30,7 +30,7 @@ import logging

 import mailman.config.config

 import mailman.core.logging

-from importlib_resources import read_text

+from importlib.resources import read_text

 from mailman.interfaces.database import IDatabaseFactory

 from public import public

 from zope.component import getUtility

diff --git a/src/mailman/email/tests/test_message.py b/src/mailman/email/tests/test_message.py

index 9d3c312..b3fe526 100644

--- a/src/mailman/email/tests/test_message.py

+++ b/src/mailman/email/tests/test_message.py

@@ -22,7 +22,7 @@ import unittest

 from email import message_from_binary_file

 from email.header import Header

 from email.parser import FeedParser

-from importlib_resources import path

+from importlib.resources import path

 from mailman.app.lifecycle import create_list

 from mailman.email.message import Message, UserNotification

 from mailman.testing.helpers import get_queue_messages

diff --git a/src/mailman/handlers/tests/test_mimedel.py b/src/mailman/handlers/tests/test_mimedel.py

index 3a2724d..ed8bd79 100644

--- a/src/mailman/handlers/tests/test_mimedel.py

+++ b/src/mailman/handlers/tests/test_mimedel.py

@@ -25,7 +25,7 @@ import tempfile

 import unittest

 from contextlib import ExitStack, contextmanager

-from importlib_resources import open_binary as resource_open, read_text

+from importlib.resources import open_binary as resource_open, read_text

 from io import StringIO

 from mailman.app.lifecycle import create_list

 from mailman.config import config

diff --git a/src/mailman/plugins/docs/intro.rst b/src/mailman/plugins/docs/intro.rst

index 0e9ce60..2a801d1 100644

--- a/src/mailman/plugins/docs/intro.rst

+++ b/src/mailman/plugins/docs/intro.rst

@@ -16,7 +16,7 @@ enabled by adding a section to your ``mailman.cfg`` file, such as:

 We have such a configuration file handy.

-    >>> from importlib_resources import path

+    >>> from importlib.resources import path

     >>> config_file = str(cleanups.enter_context(

     ...     path('mailman.plugins.testing', 'hooks.cfg')))

diff --git a/src/mailman/plugins/testing/layer.py b/src/mailman/plugins/testing/layer.py

index 7013e8d..c6ef449 100644

--- a/src/mailman/plugins/testing/layer.py

+++ b/src/mailman/plugins/testing/layer.py

@@ -20,7 +20,7 @@

 import os

 from contextlib import ExitStack

-from importlib_resources import path

+from importlib.resources import path

 from mailman.testing.helpers import (

     TestableMaster, hackenv, wait_for_webservice)

 from mailman.testing.layers import SMTPLayer

diff --git a/src/mailman/rules/dmarc.py b/src/mailman/rules/dmarc.py

index 1471f2c..37e830b 100644

--- a/src/mailman/rules/dmarc.py

+++ b/src/mailman/rules/dmarc.py

@@ -24,7 +24,7 @@ import dns.resolver

 from dns.exception import DNSException

 from email.utils import parseaddr

-from importlib_resources import read_binary

+from importlib.resources import read_binary

 from lazr.config import as_timedelta

 from mailman.config import config

 from mailman.core.i18n import _

diff --git a/src/mailman/rules/tests/test_dmarc.py b/src/mailman/rules/tests/test_dmarc.py

index 0f92412..c360b47 100644

--- a/src/mailman/rules/tests/test_dmarc.py

+++ b/src/mailman/rules/tests/test_dmarc.py

@@ -27,7 +27,7 @@ from dns.rdatatype import CNAME, TXT

 from dns.resolver import NXDOMAIN, NoAnswer, NoNameservers

 from email import message_from_bytes

 from http.server import BaseHTTPRequestHandler, HTTPServer

-from importlib_resources import path

+from importlib.resources import path

 from lazr.config import as_timedelta

 from mailman.app.lifecycle import create_list

 from mailman.config import config

diff --git a/src/mailman/testing/i18n.py b/src/mailman/testing/i18n.py

index 692b21e..93b7426 100644

--- a/src/mailman/testing/i18n.py

+++ b/src/mailman/testing/i18n.py

@@ -19,7 +19,7 @@

 from flufl.i18n import registry

 from gettext import GNUTranslations, NullTranslations

-from importlib_resources import open_binary

+from importlib.resources import open_binary

 from public import public

diff --git a/src/mailman/testing/layers.py b/src/mailman/testing/layers.py

index c7574c9..f433716 100644

--- a/src/mailman/testing/layers.py

+++ b/src/mailman/testing/layers.py

@@ -31,7 +31,7 @@ import logging

 import datetime

 import tempfile

-from importlib_resources import read_text

+from importlib.resources import read_text

 from lazr.config import as_boolean

 from mailman.config import config

 from mailman.core import initialize

diff --git a/src/mailman/utilities/i18n.py b/src/mailman/utilities/i18n.py

index 17d6c23..6f4b224 100644

--- a/src/mailman/utilities/i18n.py

+++ b/src/mailman/utilities/i18n.py

@@ -21,7 +21,7 @@ import os

 import sys

 from contextlib import ExitStack

-from importlib_resources import path

+from importlib.resources import path

 from itertools import product

 from mailman.config import config

 from mailman.core.constants import system_preferences

diff --git a/src/mailman/utilities/modules.py b/src/mailman/utilities/modules.py

index 749d08e..3a7cd7d 100644

--- a/src/mailman/utilities/modules.py

+++ b/src/mailman/utilities/modules.py

@@ -22,7 +22,7 @@ import sys

 from contextlib import contextmanager

 from importlib import import_module

-from importlib_resources import contents, is_resource, path

+from importlib.resources import contents, is_resource, path

 from public import public

diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py

index 72476d8..2472901 100644

--- a/src/mailman/utilities/tests/test_import.py

+++ b/src/mailman/utilities/tests/test_import.py

@@ -22,7 +22,7 @@ import unittest

 from datetime import timedelta, datetime

 from enum import Enum

-from importlib_resources import open_binary

+from importlib.resources import open_binary

 from mailman.app.lifecycle import create_list

 from mailman.config import config

 from mailman.handlers.decorate import decorate

diff --git a/src/mailman/utilities/tests/test_modules.py b/src/mailman/utilities/tests/test_modules.py

index 669c07a..cf345d8 100644

--- a/src/mailman/utilities/tests/test_modules.py

+++ b/src/mailman/utilities/tests/test_modules.py

@@ -22,7 +22,7 @@ import sys

 import unittest

 from contextlib import ExitStack, contextmanager

-from importlib_resources import path

+from importlib.resources import path

 from mailman.interfaces.rules import IRule

 from mailman.interfaces.styles import IStyle

 from mailman.testing.helpers import configuration

diff --git a/src/mailman/utilities/tests/test_templates.py b/src/mailman/utilities/tests/test_templates.py

index 32e8c5a..4aca533 100644

--- a/src/mailman/utilities/tests/test_templates.py

+++ b/src/mailman/utilities/tests/test_templates.py

@@ -23,7 +23,7 @@ import tempfile

 import unittest

 from contextlib import ExitStack

-from importlib_resources import path as resource_path

+from importlib.resources import path as resource_path

 from mailman.app.lifecycle import create_list

 from mailman.config import config

 from mailman.interfaces.languages import ILanguageManager

-- 

2.21.0