summaryrefslogtreecommitdiff
path: root/src/mailman/rest/listconf.py
diff options
context:
space:
mode:
authorBarry Warsaw2015-01-04 20:40:47 -0500
committerBarry Warsaw2015-01-04 20:40:47 -0500
commit81be16cdfd9ecf86092c90874eb661be2e754043 (patch)
treeb7493a05db05a93f875e3a27754d852b702cfb50 /src/mailman/rest/listconf.py
parent3ed695772e7e9c17234097e820a4cedfb0ad3a5d (diff)
downloadmailman-81be16cdfd9ecf86092c90874eb661be2e754043.tar.gz
mailman-81be16cdfd9ecf86092c90874eb661be2e754043.tar.zst
mailman-81be16cdfd9ecf86092c90874eb661be2e754043.zip
Diffstat (limited to 'src/mailman/rest/listconf.py')
-rw-r--r--src/mailman/rest/listconf.py18
1 files changed, 8 insertions, 10 deletions
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),
)