------------------------------------------------------------
revno: 986
committer: Tokio Kikuchi <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Mon 2007-09-17 14:51:10 +0900
message:
merge from launchpad
modified:
bin/dumpdb
doc/mailman-admin.tex
doc/mailman-install.tex
------------------------------------------------------------
revno: 984.1.5
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Wed 2007-09-12 14:36:43 -0400
message:
Start using barry at list dot org for all Mailman correspondances.
modified:
doc/mailman-admin.tex
doc/mailman-install.tex
------------------------------------------------------------
revno: 984.1.4
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Fri 2007-08-03 18:16:56 -0700
message:
Updated copyright year.
modified:
bin/dumpdb
------------------------------------------------------------
revno: 984.1.3
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Fri 2007-08-03 18:09:33 -0700
message:
Ooops! The previous rev copied a configured file by mistake. Fixed.
modified:
bin/dumpdb
------------------------------------------------------------
revno: 984.1.2
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Fri 2007-08-03 17:46:05 -0700
message:
Backported dumpdb changes from the 3.0 branch to allow dumping of
marshals.
This has been broken since 2.1.5!
modified:
bin/dumpdb
=== modified file 'bin/dumpdb'
--- a/bin/dumpdb 2005-08-27 01:40:17 +0000
+++ b/bin/dumpdb 2007-08-04 01:16:56 +0000
@@ -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 @@
-- 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 @@
# 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)
+ load = marshal.load
+ typename = 'marshal'
+ else:
+ load = cPickle.load
+ typename = 'pickle'
+ fp = open(filename)
+ m = []
+ try:
+ cnt = 1
if doprint:
- pp.pprint(d)
- return d
- else:
- fp = open(filename)
- m = []
- try:
- cnt = 1
+ print _('[----- start %(typename)s file -----]')
+ while True:
+ try:
+ obj = load(fp)
+ except EOFError:
+ if doprint:
+ print _('[----- end %(typename)s file -----]')
+ break
if doprint:
- print _('[----- start pickle file -----]')
- while True:
- try:
- obj = load(fp)
- except EOFError:
- if doprint:
- print _('[----- end pickle 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
+ 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
=== modified file 'doc/mailman-admin.tex'
--- a/doc/mailman-admin.tex 2003-02-08 07:14:13 +0000
+++ b/doc/mailman-admin.tex 2007-09-12 18:36:43 +0000
@@ -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}
[EMAIL PROTECTED]
+%\authoraddress{barry (at) list dot org}
\date{\today} % XXX update before tagging release!
\release{2.1} % software release, not documentation
=== modified file 'doc/mailman-install.tex'
--- a/doc/mailman-install.tex 2007-02-15 01:59:46 +0000
+++ b/doc/mailman-install.tex 2007-09-12 18:36:43 +0000
@@ -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
--
https://code.launchpad.net/~mailman-coders/mailman/2.1
You are receiving this branch notification because you are subscribed to it.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+subscription/mailman-checkins.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
