From 327865eaf118f40063366acad9c7d97487e010d6 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Sat, 14 Jul 2007 21:23:28 -0400 Subject: Other than contrib files, convert all imports of mm_cfg to imports of config. Ignore mailman.egg-info In bin/make_instance.py: Catch and ignore import errors when importing Mailman.i18n. Before this script has actually been run, there won't be enough infrastructure in place of the import to succeed. Include several other fixes in this file. Add install_requires to the setup script. --- Mailman/Commands/cmd_help.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Mailman/Commands/cmd_help.py') diff --git a/Mailman/Commands/cmd_help.py b/Mailman/Commands/cmd_help.py index 33e908295..1afe25697 100644 --- a/Mailman/Commands/cmd_help.py +++ b/Mailman/Commands/cmd_help.py @@ -19,11 +19,11 @@ Print this help message. """ -import sys import os +import sys -from Mailman import mm_cfg from Mailman import Utils +from Mailman.configuration import config from Mailman.i18n import _ EMPTYSTRING = '' @@ -81,7 +81,7 @@ def process(res, args): helptext = Utils.maketext( 'help.txt', {'listname' : mlist.real_name, - 'version' : mm_cfg.VERSION, + 'version' : config.VERSION, 'listinfo_url': mlist.GetScriptURL('listinfo', absolute=1), 'requestaddr' : mlist.GetRequestEmail(), 'adminaddr' : mlist.GetOwnerEmail(), -- cgit v1.2.3-70-g09d2