------------------------------------------------------------
revno: 6641
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: 3.0
timestamp: Wed 2008-09-24 22:58:40 -0400
message:
thread merge
modified:
mailman/database/__init__.py
mailman/interfaces/usermanager.py
------------------------------------------------------------
revno: 6638.1.3
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: 05-subscriptions
timestamp: Tue 2008-09-23 22:38:19 -0400
message:
thread merge
modified:
TODO.txt
mailman/app/registrar.py
mailman/archiving/pipermail.py
mailman/docs/domains.txt
mailman/docs/registration.txt
------------------------------------------------------------
revno: 6638.1.2
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: 05-subscriptions
timestamp: Sun 2008-09-21 18:11:26 -0400
message:
mergeRF
added:
mailman/docs/domains.txt
mailman/domain.py
modified:
mailman/Cgi/create.py
mailman/Defaults.py
mailman/archiving/mhonarc.py
mailman/archiving/pipermail.py
mailman/archiving/prototype.py
mailman/configuration.py
mailman/interfaces/domain.py
mailman/testing/testing.cfg.in
mailman/tests/test_documentation.py
------------------------------------------------------------
revno: 6638.1.1
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: 05-subscriptions
timestamp: Wed 2008-09-10 23:12:08 -0400
message:
Use pkg_resources to find mailman.sql file.
Flesh out a docstring.
modified:
mailman/database/__init__.py
mailman/interfaces/usermanager.py
=== modified file 'mailman/database/__init__.py'
--- a/mailman/database/__init__.py 2008-03-31 18:12:04 +0000
+++ b/mailman/database/__init__.py 2008-09-11 03:12:08 +0000
@@ -25,13 +25,13 @@
import os
from locknix.lockfile import Lock
+from pkg_resources import resource_string
from storm.locals import create_database, Store
from string import Template
from urlparse import urlparse
from zope.interface import implements
import mailman.version
-import mailman.database
from mailman.configuration import config
from mailman.database.listmanager import ListManager
@@ -114,11 +114,7 @@
store.execute('select tbl_name from sqlite_master;')]
if 'version' not in table_names:
# Initialize the database.
- schema_file = os.path.join(
- os.path.dirname(mailman.database.__file__),
- 'mailman.sql')
- with open(schema_file) as fp:
- sql = fp.read()
+ sql = resource_string('mailman.database', 'mailman.sql')
for statement in sql.split(';'):
store.execute(statement + ';')
# Validate schema version.
=== modified file 'mailman/interfaces/usermanager.py'
--- a/mailman/interfaces/usermanager.py 2008-02-20 02:22:20 +0000
+++ b/mailman/interfaces/usermanager.py 2008-09-11 03:12:08 +0000
@@ -75,10 +75,13 @@
"""
def get_address(address):
- """Find and return an IAddress.
+ """Find and return the `IAddress` matching a text address.
- 'address' is a text email address. None is returned if there is no
- registered IAddress for the given text address.
+ :param address: the text email address
+ :type address: string
+ :return: The matching `IAddress` object, or None if no registered
+ `IAddress` matches the text address
+ :rtype: `IAddress` or None
"""
addresses = Attribute(
--
Primary development focus
https://code.launchpad.net/~mailman-coders/mailman/3.0
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
