diff options
| author | Barry Warsaw | 2014-04-14 12:12:39 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2014-04-14 12:12:39 -0400 |
| commit | ff6df86000da8fcb055101c5cede36b27cb0480a (patch) | |
| tree | 6b700bb00766dda02b8742f2ca9ef10c0ba3d2ee /src/mailman/interfaces | |
| parent | b4d3a036b5949c6945b13416615cfd356a327ee2 (diff) | |
| parent | acc302099df53474e631117351f8116727c1ceb6 (diff) | |
| download | mailman-ff6df86000da8fcb055101c5cede36b27cb0480a.tar.gz mailman-ff6df86000da8fcb055101c5cede36b27cb0480a.tar.zst mailman-ff6df86000da8fcb055101c5cede36b27cb0480a.zip | |
Aurélien Bompard's import-from-2.1 branch, with cleanup and fixes.
Diffstat (limited to 'src/mailman/interfaces')
| -rw-r--r-- | src/mailman/interfaces/mailinglist.py | 2 | ||||
| -rw-r--r-- | src/mailman/interfaces/templates.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mailman/interfaces/mailinglist.py b/src/mailman/interfaces/mailinglist.py index 7beaf9c46..0615ad239 100644 --- a/src/mailman/interfaces/mailinglist.py +++ b/src/mailman/interfaces/mailinglist.py @@ -450,7 +450,7 @@ class IMailingList(Interface): that gets created to accumlate messages for the digest. """) - administrative = Attribute( + administrivia = Attribute( """Flag controlling `administrivia` checks. Administrivia tests check whether postings to the mailing list are diff --git a/src/mailman/interfaces/templates.py b/src/mailman/interfaces/templates.py index cb056471f..aec4e8d24 100644 --- a/src/mailman/interfaces/templates.py +++ b/src/mailman/interfaces/templates.py @@ -42,5 +42,6 @@ class ITemplateLoader(Interface): :param uri: The URI of the resource. These may be any URI supported by `urllib2` and also `mailman:` URIs for internal resources. :type uri: string - :return: An open file object as defined by urllib2. + :return: The template string as a unicode. + :rtype: str """ |