← Back to branch summary

~barry/mailman/lp1423756

« back to all changes in this revision

Viewing changes to src/mailman/rest/members.py

  • Committer: Barry Warsaw
  • Date: 2015-01-05 01:20:33 UTC
  • mfrom: (7264.4.66 py3)
  • Revision ID: barry@list.org-20150105012033-zdrw9c2odhpf22fz
Merge the Python 3 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mailman/rest/members.py
17
17
 
18
18
"""REST for members."""
19
19
 
20
 
from __future__ import absolute_import, print_function, unicode_literals
21
 
 
22
 
__metaclass__ = type
23
20
__all__ = [
24
21
    'AMember',
25
22
    'AllMembers',
28
25
    ]
29
26
 
30
27
 
31
 
from uuid import UUID
32
 
from operator import attrgetter
33
 
from zope.component import getUtility
 
28
import six
34
29
 
35
30
from mailman.app.membership import delete_member
36
31
from mailman.interfaces.address import InvalidEmailAddressError
47
42
from mailman.rest.preferences import Preferences, ReadOnlyPreferences
48
43
from mailman.rest.validator import (
49
44
    Validator, enum_validator, subscriber_validator)
 
45
from operator import attrgetter
 
46
from uuid import UUID
 
47
from zope.component import getUtility
50
48
 
51
49
 
52
50
 
176
174
            return
177
175
        try:
178
176
            values = Validator(
179
 
                address=unicode,
 
177
                address=six.text_type,
180
178
                delivery_mode=enum_validator(DeliveryMode),
181
179
                _optional=('address', 'delivery_mode'))(request)
182
180
        except ValueError as error:
207
205
        service = getUtility(ISubscriptionService)
208
206
        try:
209
207
            validator = Validator(
210
 
                list_id=unicode,
 
208
                list_id=six.text_type,
211
209
                subscriber=subscriber_validator,
212
 
                display_name=unicode,
 
210
                display_name=six.text_type,
213
211
                delivery_mode=enum_validator(DeliveryMode),
214
212
                role=enum_validator(MemberRole),
215
213
                _optional=('delivery_mode', 'display_name', 'role'))
256
254
        """Find a member"""
257
255
        service = getUtility(ISubscriptionService)
258
256
        validator = Validator(
259
 
            list_id=unicode,
260
 
            subscriber=unicode,
 
257
            list_id=six.text_type,
 
258
            subscriber=six.text_type,
261
259
            role=enum_validator(MemberRole),
262
260
            _optional=('list_id', 'subscriber', 'role'))
263
261
        try: