← Back to branch summary

~barry/mailman/lp1423756

« back to all changes in this revision

Viewing changes to src/mailman/model/mailinglist.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/model/mailinglist.py
17
17
 
18
18
"""Model for mailing lists."""
19
19
 
20
 
from __future__ import absolute_import, print_function, unicode_literals
21
 
 
22
 
__metaclass__ = type
23
20
__all__ = [
24
21
    'MailingList',
25
22
    ]
27
24
 
28
25
import os
29
26
 
30
 
from sqlalchemy import (
31
 
    Boolean, Column, DateTime, Float, ForeignKey, Integer, Interval,
32
 
    LargeBinary, PickleType, Unicode)
33
 
from sqlalchemy.event import listen
34
 
from sqlalchemy.orm import relationship
35
 
from urlparse import urljoin
36
 
from zope.component import getUtility
37
 
from zope.event import notify
38
 
from zope.interface import implementer
39
 
 
40
27
from mailman.config import config
41
28
from mailman.database.model import Model
42
29
from mailman.database.transaction import dbconnection
65
52
from mailman.model.preferences import Preferences
66
53
from mailman.utilities.filesystem import makedirs
67
54
from mailman.utilities.string import expand
 
55
from six.moves.urllib_parse import urljoin
 
56
from sqlalchemy import (
 
57
    Boolean, Column, DateTime, Float, ForeignKey, Integer, Interval,
 
58
    LargeBinary, PickleType, Unicode)
 
59
from sqlalchemy.event import listen
 
60
from sqlalchemy.orm import relationship
 
61
from zope.component import getUtility
 
62
from zope.event import notify
 
63
from zope.interface import implementer
68
64
 
69
65
 
70
66
SPACE = ' '
482
478
                Member._user == subscriber).first()
483
479
            if member:
484
480
                raise AlreadySubscribedError(
485
 
                    self.fqdn_listname, subscriber, role)
 
481
                    self.fqdn_listname,
 
482
                    subscriber.preferred_address.email,
 
483
                    role)
486
484
        else:
487
485
            raise ValueError('subscriber must be an address or user')
488
486
        member = Member(role=role,