diff options
| -rw-r--r-- | bin/dumpdb | 63 | ||||
| -rw-r--r-- | doc/mailman-admin.tex | 2 | ||||
| -rw-r--r-- | doc/mailman-install.tex | 2 |
3 files changed, 32 insertions, 35 deletions
@@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2005 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 @@ -45,16 +45,15 @@ Python pickle. In either case, if you want to override the default assumption -- or if the file ends in neither suffix -- use the -p or -m flags. """ -import os import sys import getopt import pprint -from cPickle import load +import cPickle +import marshal from types import StringType import paths # Import this /after/ paths so that the sys.path is properly hacked -from email.Generator import Generator from Mailman.i18n import _ PROGRAM = sys.argv[0] @@ -121,37 +120,35 @@ def main(): # Handle dbs pp = pprint.PrettyPrinter(indent=4) if filetype == 1: - # BAW: this probably doesn't work if there are mixed types of .db - # files (i.e. some marshals, some bdbs). - d = DumperSwitchboard().read(filename) - if doprint: - pp.pprint(d) - return d + load = marshal.load + typename = 'marshal' else: - fp = open(filename) - m = [] - try: - cnt = 1 - if doprint: - print _('[----- start pickle file -----]') - while True: - try: - obj = load(fp) - except EOFError: - if doprint: - print _('[----- end pickle file -----]') - break + load = cPickle.load + typename = 'pickle' + fp = open(filename) + m = [] + try: + cnt = 1 + if doprint: + print _('[----- start %(typename)s file -----]') + while True: + try: + obj = load(fp) + except EOFError: if doprint: - print _('<----- start object %(cnt)s ----->') - if isinstance(obj, StringType): - print obj - else: - pp.pprint(obj) - cnt += 1 - m.append(obj) - finally: - fp.close() - return m + print _('[----- end %(typename)s file -----]') + break + if doprint: + print _('<----- start object %(cnt)s ----->') + if isinstance(obj, StringType): + print obj + else: + pp.pprint(obj) + cnt += 1 + m.append(obj) + finally: + fp.close() + return m diff --git a/doc/mailman-admin.tex b/doc/mailman-admin.tex index 197a18f1..6a9e3c77 100644 --- a/doc/mailman-admin.tex +++ b/doc/mailman-admin.tex @@ -9,7 +9,7 @@ % At minimum, give your name and an email address. You can include a % snail-mail address if you like. \author{Barry A. Warsaw} -%\authoraddress{barry@zope.com} +%\authoraddress{barry (at) list dot org} \date{\today} % XXX update before tagging release! \release{2.1} % software release, not documentation diff --git a/doc/mailman-install.tex b/doc/mailman-install.tex index 0d295221..efc9a5e3 100644 --- a/doc/mailman-install.tex +++ b/doc/mailman-install.tex @@ -2,7 +2,7 @@ \title{GNU Mailman - Installation Manual} \author{Barry Warsaw} -\authoraddress{\email{barry(at)python.org}} +\authoraddress{\email{barry (at) list dot org}} \date{\today} \release{2.1} % software release, not documentation |