diff options
| -rw-r--r-- | mailman/database/__init__.py | 8 | ||||
| -rw-r--r-- | mailman/interfaces/usermanager.py | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/mailman/database/__init__.py b/mailman/database/__init__.py index e128bf2fa..b4320613f 100644 --- a/mailman/database/__init__.py +++ b/mailman/database/__init__.py @@ -25,13 +25,13 @@ __all__ = [ 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 @@ class StockDatabase: 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. diff --git a/mailman/interfaces/usermanager.py b/mailman/interfaces/usermanager.py index 702370593..72dc8e37f 100644 --- a/mailman/interfaces/usermanager.py +++ b/mailman/interfaces/usermanager.py @@ -75,10 +75,13 @@ class IUserManager(Interface): """ 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( |