Rework MailList.available_languages so that we don't need to use a PickleType

column in the database for this list of strings.  We use SQLAlchemy's
many-to-many relationship, however because of this, you cannot simply append
new unicodes to .available_languages.  You need to wrap the language code in a
Language instance and append that instance to the list.

In order to handle this, I added a property MailList.language_codes which
returns a list of the code strings (not Language instances).  Also new are
MailList.set_languages() for setting (i.e. overriding) the set of available
languages for the list; and add_language() which takes a single language code,
wraps it, and appends it.  The code does not and should not use
.available_languages directory any more.

MailList.GetAvailableLanguages() is removed.  The 'available_languages' column
is removed from the Listdata table.

Add a getValue() to Mailman.Gui.Language in order to unwrap the language codes
stored in the database's association table.  Modify _setValue() to do the
wrapping.

In dbcontext.py, don't import * from the sqlalchemy package.  It contains a
'logging' name which is not the standard Python logging package.  I also added
essentially a bag of attributes class called Tables which will hold references
to all the SA tables that are created.  Update the make_table() API to take an
instance of Tables.

Added a close() method to DBContext.  This is needed for the updated unit test
suite.

Changed bin/import.py so that when available_languages is being set, it calls
MailList.set_languages() instead of trying to set that attribute directly.

Updated some language idioms while I was at it.

More eradication of mm_cfg in favor of the config object and the Defaults
module.

In testall.py, call initialize() instead of loginit.initialize().

Promote MAX_RESTARTS into a Defaults.py.in variable.  This is because the unit
tests will knock that value down to something not so annoying should one of
the qrunner-required tests traceback.

Several other important changes to the unit test suite (which now completely
succeeds again!):

- Set the uid and gid of the temporary mailman.cfg and tmp*.db files to the
  Mailman user and group as specified in the config object.

- Make sure that all of the tests point to a SQLite database file that was
  created with the tempfile module.  This way we don't pollute our main
  database with data that is getting created during the unit tests.

- In the TestBase.setUp() method, be sure to close the existing dbcontext,
  clear out the mappers, and then reconnect the dbcontext with the new
  SQLALCHEMY_ENGINE_URL pointing to the tempfile.  However, we don't need to
  reload the MailList instance any more.

- Make all tests work, except for the tests that require crypt.  That upgrade
  path will not be available in this version of Mailman.

1 files changed, 25 insertions, 12 deletions

diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 9f790c242..640baa314 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -49,6 +49,7 @@ from Mailman import Version
 from Mailman import database
 from Mailman.UserDesc import UserDesc
 from Mailman.configuration import config
+from Mailman.database.languages import Language
 
 # Base classes
 from Mailman import Pending
@@ -295,6 +296,7 @@ class MailList(object, HTMLFormatter, Deliverer, ListAdmin,
             user = Utils.ObscureEmail(user)
         return '%s/%s' % (url, urllib.quote(user.lower()))
 
+
 
     #
     # Instance and subcomponent initialization
@@ -415,7 +417,6 @@ class MailList(object, HTMLFormatter, Deliverer, ListAdmin,
         self.admin_member_chunksize = config.DEFAULT_ADMIN_MEMBER_CHUNKSIZE
         self.administrivia = config.DEFAULT_ADMINISTRIVIA
         self.preferred_language = config.DEFAULT_SERVER_LANGUAGE
-        self.available_languages = []
         self.include_rfc2369_headers = 1
         self.include_list_post_header = 1
         self.filter_mime_types = config.DEFAULT_FILTER_MIME_TYPES
@@ -559,9 +560,9 @@ class MailList(object, HTMLFormatter, Deliverer, ListAdmin,
         self.InitVars(listname, admin_email, crypted_password)
         self.CheckValues()
         if langs is None:
-            self.available_languages = [self.preferred_language]
-        else:
-            self.available_languages = langs
+            langs = [self.preferred_language]
+        for language_code in langs:
+            self.set_languages(*langs)
         url_host = config.domains[email_host]
         self.web_page_url = config.DEFAULT_URL_PATTERN % url_host
         database.add_list(self)
@@ -1440,14 +1441,26 @@ bad regexp in bounce_matching_header line: %s
     #
     # Multilingual (i18n) support
     #
-    def GetAvailableLanguages(self):
-        langs = self.available_languages
+    def set_languages(self, *language_codes):
+        # Don't use the language_codes property because that will add the
+        # default server language.  The effect would be that the default
+        # server language would never get added to the list's list of
+        # languages.
+        self.available_languages = [Language(code) for code in language_codes
+                                    if code in config.LC_DESCRIPTIONS]
+
+    def add_language(self, language_code):
+        self.available_languages.append(Language(language_code))
+
+    @property
+    def language_codes(self):
+        # Callers of this method expect a list of language codes
+        codes = [lang.code for lang in self.available_languages
+                 if lang.code in config.LC_DESCRIPTIONS]
         # If we don't add this, and the site admin has never added any
         # language support to the list, then the general admin page may have a
         # blank field where the list owner is supposed to chose the list's
         # preferred language.
-        if config.DEFAULT_SERVER_LANGUAGE not in langs:
-            langs.append(config.DEFAULT_SERVER_LANGUAGE)
-        # When testing, it's possible we've disabled a language, so just
-        # filter things out so we don't get tracebacks.
-        return [lang for lang in langs if config.LC_DESCRIPTIONS.has_key(lang)]
+        if config.DEFAULT_SERVER_LANGUAGE not in codes:
+            codes.append(config.DEFAULT_SERVER_LANGUAGE)
+        return codes