Another round of merges of my Pycon branch...

bin/testall.py
    - Improvements to setting up the tests with temporary files for the db and
      configuration.  Don't accept -C/--config because that will just confuse
      things.
    - Copy our new testing.cfg.in template file to a temp file, populate it
      with a few additional run-time calculate values, and use that in both
      the parent (bin/testall script) and children (bin/mailmanctl and
      friends).

Mailman/initialize.py
    - Split up initialize() into two functions as required by the test suite
      reorg above.  Almost everything else in Mailman will continue to use the
      initialize() function though.

Mailman/configuration.py
    - Store the filename that was used to load the .cfg file from on the
      configuration object.

1 files changed, 2 insertions, 0 deletions

diff --git a/Mailman/configuration.py b/Mailman/configuration.py
index a489025ca..a0d35e483 100644
--- a/Mailman/configuration.py
+++ b/Mailman/configuration.py
@@ -72,12 +72,14 @@ class Configuration(object):
         path = os.path.abspath(os.path.expanduser(filename))
         try:
             execfile(path, ns, ns)
+            self.filename = path
         except EnvironmentError, e:
             if e.errno <> errno.ENOENT or original_filename:
                 raise
             # The file didn't exist, so try mm_cfg.py
             from Mailman import mm_cfg
             ns.update(mm_cfg.__dict__)
+            self.filename = None
         # Based on values possibly set in mailman.cfg, add additional qrunners
         if ns['USE_MAILDIR']:
             self.add_qrunner('Maildir')