summaryrefslogtreecommitdiff
path: root/src/mailman/rest
diff options
context:
space:
mode:
Diffstat (limited to 'src/mailman/rest')
-rw-r--r--src/mailman/rest/addresses.py6
-rw-r--r--src/mailman/rest/docs/helpers.rst5
-rw-r--r--src/mailman/rest/domains.py10
-rw-r--r--src/mailman/rest/listconf.py18
-rw-r--r--src/mailman/rest/lists.py6
-rw-r--r--src/mailman/rest/members.py12
-rw-r--r--src/mailman/rest/queues.py6
-rw-r--r--src/mailman/rest/tests/test_addresses.py2
-rw-r--r--src/mailman/rest/tests/test_domains.py2
-rw-r--r--src/mailman/rest/tests/test_lists.py2
-rw-r--r--src/mailman/rest/tests/test_membership.py2
-rw-r--r--src/mailman/rest/tests/test_moderation.py2
-rw-r--r--src/mailman/rest/tests/test_preferences.py2
-rw-r--r--src/mailman/rest/tests/test_queues.py2
-rw-r--r--src/mailman/rest/tests/test_root.py2
-rw-r--r--src/mailman/rest/tests/test_systemconf.py2
-rw-r--r--src/mailman/rest/tests/test_users.py2
17 files changed, 35 insertions, 48 deletions
diff --git a/src/mailman/rest/addresses.py b/src/mailman/rest/addresses.py
index 0d06391ea..2ce456b98 100644
--- a/src/mailman/rest/addresses.py
+++ b/src/mailman/rest/addresses.py
@@ -24,8 +24,6 @@ __all__ = [
]
-import six
-
from mailman.interfaces.address import (
ExistingAddressError, InvalidEmailAddressError)
from mailman.interfaces.usermanager import IUserManager
@@ -196,8 +194,8 @@ class UserAddresses(_AddressBase):
not_found(response)
return
user_manager = getUtility(IUserManager)
- validator = Validator(email=six.text_type,
- display_name=six.text_type,
+ validator = Validator(email=str,
+ display_name=str,
_optional=('display_name',))
try:
address = user_manager.create_address(**validator(request))
diff --git a/src/mailman/rest/docs/helpers.rst b/src/mailman/rest/docs/helpers.rst
index 5614e6544..c40619c01 100644
--- a/src/mailman/rest/docs/helpers.rst
+++ b/src/mailman/rest/docs/helpers.rst
@@ -69,9 +69,8 @@ Another helper unpacks ``POST`` and ``PUT`` request variables, validating and
converting their values.
::
- >>> import six
>>> from mailman.rest.validator import Validator
- >>> validator = Validator(one=int, two=six.text_type, three=bool)
+ >>> validator = Validator(one=int, two=str, three=bool)
>>> class FakeRequest:
... params = None
@@ -120,7 +119,7 @@ Extra keys are also not allowed.
However, if optional keys are missing, it's okay.
::
- >>> validator = Validator(one=int, two=six.text_type, three=bool,
+ >>> validator = Validator(one=int, two=str, three=bool,
... four=int, five=int,
... _optional=('four', 'five'))
diff --git a/src/mailman/rest/domains.py b/src/mailman/rest/domains.py
index 02b46494b..345e8327d 100644
--- a/src/mailman/rest/domains.py
+++ b/src/mailman/rest/domains.py
@@ -23,8 +23,6 @@ __all__ = [
]
-import six
-
from mailman.interfaces.domain import (
BadDomainSpecificationError, IDomainManager)
from mailman.rest.helpers import (
@@ -98,10 +96,10 @@ class AllDomains(_DomainBase):
"""Create a new domain."""
domain_manager = getUtility(IDomainManager)
try:
- validator = Validator(mail_host=six.text_type,
- description=six.text_type,
- base_url=six.text_type,
- contact_address=six.text_type,
+ validator = Validator(mail_host=str,
+ description=str,
+ base_url=str,
+ contact_address=str,
_optional=('description', 'base_url',
'contact_address'))
domain = domain_manager.add(**validator(request))
diff --git a/src/mailman/rest/listconf.py b/src/mailman/rest/listconf.py
index 831d6fefe..e83f52833 100644
--- a/src/mailman/rest/listconf.py
+++ b/src/mailman/rest/listconf.py
@@ -22,8 +22,6 @@ __all__ = [
]
-import six
-
from lazr.config import as_boolean, as_timedelta
from mailman.config import config
from mailman.core.errors import (
@@ -108,9 +106,9 @@ ATTRIBUTES = dict(
autorespond_postings=GetterSetter(enum_validator(ResponseAction)),
autorespond_requests=GetterSetter(enum_validator(ResponseAction)),
autoresponse_grace_period=GetterSetter(as_timedelta),
- autoresponse_owner_text=GetterSetter(six.text_type),
- autoresponse_postings_text=GetterSetter(six.text_type),
- autoresponse_request_text=GetterSetter(six.text_type),
+ autoresponse_owner_text=GetterSetter(str),
+ autoresponse_postings_text=GetterSetter(str),
+ autoresponse_request_text=GetterSetter(str),
archive_policy=GetterSetter(enum_validator(ArchivePolicy)),
bounces_address=GetterSetter(None),
collapse_alternatives=GetterSetter(as_boolean),
@@ -118,7 +116,7 @@ ATTRIBUTES = dict(
created_at=GetterSetter(None),
default_member_action=GetterSetter(enum_validator(Action)),
default_nonmember_action=GetterSetter(enum_validator(Action)),
- description=GetterSetter(six.text_type),
+ description=GetterSetter(str),
digest_last_sent_at=GetterSetter(None),
digest_size_threshold=GetterSetter(float),
filter_content=GetterSetter(as_boolean),
@@ -137,16 +135,16 @@ ATTRIBUTES = dict(
post_id=GetterSetter(None),
posting_address=GetterSetter(None),
posting_pipeline=GetterSetter(pipeline_validator),
- display_name=GetterSetter(six.text_type),
+ display_name=GetterSetter(str),
reply_goes_to_list=GetterSetter(enum_validator(ReplyToMunging)),
- reply_to_address=GetterSetter(six.text_type),
+ reply_to_address=GetterSetter(str),
request_address=GetterSetter(None),
scheme=GetterSetter(None),
send_welcome_message=GetterSetter(as_boolean),
- subject_prefix=GetterSetter(six.text_type),
+ subject_prefix=GetterSetter(str),
volume=GetterSetter(None),
web_host=GetterSetter(None),
- welcome_message_uri=GetterSetter(six.text_type),
+ welcome_message_uri=GetterSetter(str),
)
diff --git a/src/mailman/rest/lists.py b/src/mailman/rest/lists.py
index c6233796b..f6bc27917 100644
--- a/src/mailman/rest/lists.py
+++ b/src/mailman/rest/lists.py
@@ -27,8 +27,6 @@ __all__ = [
]
-import six
-
from lazr.config import as_boolean
from mailman.app.lifecycle import create_list, remove_list
from mailman.config import config
@@ -202,8 +200,8 @@ class AllLists(_ListBase):
def on_post(self, request, response):
"""Create a new mailing list."""
try:
- validator = Validator(fqdn_listname=six.text_type,
- style_name=six.text_type,
+ validator = Validator(fqdn_listname=str,
+ style_name=str,
_optional=('style_name',))
mlist = create_list(**validator(request))
except ListAlreadyExistsError:
diff --git a/src/mailman/rest/members.py b/src/mailman/rest/members.py
index 5451f7f76..925cd6718 100644
--- a/src/mailman/rest/members.py
+++ b/src/mailman/rest/members.py
@@ -25,8 +25,6 @@ __all__ = [
]
-import six
-
from mailman.app.membership import delete_member
from mailman.interfaces.address import InvalidEmailAddressError
from mailman.interfaces.listmanager import IListManager, NoSuchListError
@@ -174,7 +172,7 @@ class AMember(_MemberBase):
return
try:
values = Validator(
- address=six.text_type,
+ address=str,
delivery_mode=enum_validator(DeliveryMode),
_optional=('address', 'delivery_mode'))(request)
except ValueError as error:
@@ -205,9 +203,9 @@ class AllMembers(_MemberBase):
service = getUtility(ISubscriptionService)
try:
validator = Validator(
- list_id=six.text_type,
+ list_id=str,
subscriber=subscriber_validator,
- display_name=six.text_type,
+ display_name=str,
delivery_mode=enum_validator(DeliveryMode),
role=enum_validator(MemberRole),
_optional=('delivery_mode', 'display_name', 'role'))
@@ -254,8 +252,8 @@ class FindMembers(_MemberBase):
"""Find a member"""
service = getUtility(ISubscriptionService)
validator = Validator(
- list_id=six.text_type,
- subscriber=six.text_type,
+ list_id=str,
+ subscriber=str,
role=enum_validator(MemberRole),
_optional=('list_id', 'subscriber', 'role'))
try:
diff --git a/src/mailman/rest/queues.py b/src/mailman/rest/queues.py
index f1007052e..190f9091e 100644
--- a/src/mailman/rest/queues.py
+++ b/src/mailman/rest/queues.py
@@ -24,8 +24,6 @@ __all__ = [
]
-import six
-
from mailman.config import config
from mailman.app.inject import inject_text
from mailman.interfaces.listmanager import IListManager
@@ -75,8 +73,8 @@ class AQueue(_QueuesBase):
def on_post(self, request, response):
"""Inject a message into the queue."""
try:
- validator = Validator(list_id=six.text_type,
- text=six.text_type)
+ validator = Validator(list_id=str,
+ text=str)
values = validator(request)
except ValueError as error:
bad_request(response, str(error))
diff --git a/src/mailman/rest/tests/test_addresses.py b/src/mailman/rest/tests/test_addresses.py
index d08152333..584b81695 100644
--- a/src/mailman/rest/tests/test_addresses.py
+++ b/src/mailman/rest/tests/test_addresses.py
@@ -30,7 +30,7 @@ from mailman.interfaces.usermanager import IUserManager
from mailman.testing.helpers import call_api
from mailman.testing.layers import RESTLayer
from mailman.utilities.datetime import now
-from six.moves.urllib_error import HTTPError
+from urllib.error import HTTPError
from zope.component import getUtility
diff --git a/src/mailman/rest/tests/test_domains.py b/src/mailman/rest/tests/test_domains.py
index d10af30ef..bf53c8e70 100644
--- a/src/mailman/rest/tests/test_domains.py
+++ b/src/mailman/rest/tests/test_domains.py
@@ -29,7 +29,7 @@ from mailman.database.transaction import transaction
from mailman.interfaces.listmanager import IListManager
from mailman.testing.helpers import call_api
from mailman.testing.layers import RESTLayer
-from six.moves.urllib_error import HTTPError
+from urllib.error import HTTPError
from zope.component import getUtility
diff --git a/src/mailman/rest/tests/test_lists.py b/src/mailman/rest/tests/test_lists.py
index fed9865c4..a365db969 100644
--- a/src/mailman/rest/tests/test_lists.py
+++ b/src/mailman/rest/tests/test_lists.py
@@ -32,7 +32,7 @@ from mailman.database.transaction import transaction
from mailman.interfaces.usermanager import IUserManager
from mailman.testing.helpers import call_api
from mailman.testing.layers import RESTLayer
-from six.moves.urllib_error import HTTPError
+from urllib.error import HTTPError
from zope.component import getUtility
diff --git a/src/mailman/rest/tests/test_membership.py b/src/mailman/rest/tests/test_membership.py
index 2841f6634..e1bff833b 100644
--- a/src/mailman/rest/tests/test_membership.py
+++ b/src/mailman/rest/tests/test_membership.py
@@ -35,7 +35,7 @@ from mailman.testing.helpers import (
from mailman.runners.incoming import IncomingRunner
from mailman.testing.layers import ConfigLayer, RESTLayer
from mailman.utilities.datetime import now
-from six.moves.urllib_error import HTTPError
+from urllib.error import HTTPError
from zope.component import getUtility
diff --git a/src/mailman/rest/tests/test_moderation.py b/src/mailman/rest/tests/test_moderation.py
index 83261e8e4..262a7ec60 100644
--- a/src/mailman/rest/tests/test_moderation.py
+++ b/src/mailman/rest/tests/test_moderation.py
@@ -32,7 +32,7 @@ from mailman.interfaces.member import DeliveryMode
from mailman.testing.helpers import (
call_api, specialized_message_from_string as mfs)
from mailman.testing.layers import RESTLayer
-from six.moves.urllib_error import HTTPError
+from urllib.error import HTTPError
diff --git a/src/mailman/rest/tests/test_preferences.py b/src/mailman/rest/tests/test_preferences.py
index 1caf61d61..909b1e0e3 100644
--- a/src/mailman/rest/tests/test_preferences.py
+++ b/src/mailman/rest/tests/test_preferences.py
@@ -29,7 +29,7 @@ from mailman.database.transaction import transaction
from mailman.interfaces.usermanager import IUserManager
from mailman.testing.helpers import call_api
from mailman.testing.layers import RESTLayer
-from six.moves.urllib_error import HTTPError
+from urllib.error import HTTPError
from zope.component import getUtility
diff --git a/src/mailman/rest/tests/test_queues.py b/src/mailman/rest/tests/test_queues.py
index 43659a2e4..cc860112b 100644
--- a/src/mailman/rest/tests/test_queues.py
+++ b/src/mailman/rest/tests/test_queues.py
@@ -29,7 +29,7 @@ from mailman.config import config
from mailman.database.transaction import transaction
from mailman.testing.helpers import call_api, get_queue_messages
from mailman.testing.layers import RESTLayer
-from six.moves.urllib_error import HTTPError
+from urllib.error import HTTPError
TEXT = """\
diff --git a/src/mailman/rest/tests/test_root.py b/src/mailman/rest/tests/test_root.py
index 75e53dd8c..6d10fc635 100644
--- a/src/mailman/rest/tests/test_root.py
+++ b/src/mailman/rest/tests/test_root.py
@@ -32,7 +32,7 @@ from mailman.config import config
from mailman.core.system import system
from mailman.testing.helpers import call_api
from mailman.testing.layers import RESTLayer
-from six.moves.urllib_error import HTTPError
+from urllib.error import HTTPError
diff --git a/src/mailman/rest/tests/test_systemconf.py b/src/mailman/rest/tests/test_systemconf.py
index 0360baace..d7d0fe9a2 100644
--- a/src/mailman/rest/tests/test_systemconf.py
+++ b/src/mailman/rest/tests/test_systemconf.py
@@ -26,7 +26,7 @@ import unittest
from mailman.testing.helpers import call_api
from mailman.testing.layers import RESTLayer
-from six.moves.urllib_error import HTTPError
+from urllib.error import HTTPError
diff --git a/src/mailman/rest/tests/test_users.py b/src/mailman/rest/tests/test_users.py
index 2d85b3452..e009f63c1 100644
--- a/src/mailman/rest/tests/test_users.py
+++ b/src/mailman/rest/tests/test_users.py
@@ -33,7 +33,7 @@ from mailman.database.transaction import transaction
from mailman.interfaces.usermanager import IUserManager
from mailman.testing.helpers import call_api, configuration
from mailman.testing.layers import RESTLayer
-from six.moves.urllib_error import HTTPError
+from urllib.error import HTTPError
from zope.component import getUtility
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2026-01-08 20:12:07 +0000