From e88e32b83cfa293e1b25f082fc8b44eeb4cf754d Mon Sep 17 00:00:00 2001
From: Mark Sapiro <msapiro@value.net>
Date: Fri, 3 Aug 2007 17:46:05 -0700
Subject: Backported dumpdb changes from the 3.0 branch to allow dumping of
marshals. This has been broken since 2.1.5!
---
bin/dumpdb | 63 ++++++++++++++++++++++++++++++--------------------------------
1 file changed, 30 insertions(+), 33 deletions(-)
diff --git a/bin/dumpdb b/bin/dumpdb
index 0bde09b8..28aadff0 100644
--- a/bin/dumpdb
+++ b/bin/dumpdb
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! /usr/bin/python
#
# Copyright (C) 1998-2005 by the Free Software Foundation, Inc.
#
@@ -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
--
cgit v1.2.3
From 4b1657f5d39ebf3bef0fabf3c626e90588e8cdac Mon Sep 17 00:00:00 2001
From: Mark Sapiro <msapiro@value.net>
Date: Fri, 3 Aug 2007 18:09:33 -0700
Subject: Ooops! The previous rev copied a configured file by mistake. Fixed.
---
bin/dumpdb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/dumpdb b/bin/dumpdb
index 28aadff0..24b0a1ed 100644
--- a/bin/dumpdb
+++ b/bin/dumpdb
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! @PYTHON@
#
# Copyright (C) 1998-2005 by the Free Software Foundation, Inc.
#
--
cgit v1.2.3
From 11ec0a6db87930585d14d66670af1417a23c5de0 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <msapiro@value.net>
Date: Fri, 3 Aug 2007 18:16:56 -0700
Subject: Updated copyright year.
---
bin/dumpdb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/dumpdb b/bin/dumpdb
index 24b0a1ed..c8e42462 100644
--- a/bin/dumpdb
+++ b/bin/dumpdb
@@ -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
--
cgit v1.2.3
From 06622797ea56104b960932c992d6719c5a6251ca Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Wed, 12 Sep 2007 14:36:43 -0400
Subject: Start using barry at list dot org for all Mailman correspondances.
---
doc/mailman-admin.tex | 2 +-
doc/mailman-install.tex | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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
--
cgit v1.2.3