Rev 2030: (marien, mbp) python2.5 and elementtree fixes in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Sep 22 04:48:49 BST 2006
------------------------------------------------------------
revno: 2030
revision-id: pqm at pqm.ubuntu.com-20060922034848-49c18a6d819733bc
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
parent: mbp at sourcefrog.net-20060922032929-dd8817fc573b9ffd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 04:48:48 +0100
message:
(marien,mbp) python2.5 and elementtree fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_command.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922032929-dd8817fc573b9ffd
parent: mbp at sourcefrog.net-20060922032719-f4d915e4eb2d8dbe
parent: mbp at sourcefrog.net-20060921083525-0ac21ceb8e5bba46
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Fri 2006-09-22 13:29:29 +1000
message:
merge import fix
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060921083525-0ac21ceb8e5bba46
parent: mbp at sourcefrog.net-20060921080121-f020f844f9982383
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-09-21 18:35:25 +1000
message:
fix imports in bench_sftp
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060921080121-f020f844f9982383
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-09-21 18:01:21 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922032719-f4d915e4eb2d8dbe
parent: mbp at sourcefrog.net-20060922030738-bff07dd5361b24df
parent: marienz at gentoo.org-20060922005136-6b5e0b856a4baff3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Fri 2006-09-22 13:27:19 +1000
message:
[merge] ElementTree exception fixes
------------------------------------------------------------
merged: marienz at gentoo.org-20060922005136-6b5e0b856a4baff3
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 02:51:36 +0200
message:
Handle the different exception (non-c)ElementTree raises.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922030738-bff07dd5361b24df
parent: mbp at sourcefrog.net-20060922030240-275cc23f08aaa30a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Fri 2006-09-22 13:07:38 +1000
message:
Restore bench_sftp import of TestSkipped
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922030240-275cc23f08aaa30a
parent: mbp at sourcefrog.net-20060922023241-474fdb7540c8cf2e
parent: mbp at sourcefrog.net-20060901035507-463cb84e88732d46
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: marien.python2.5
timestamp: Fri 2006-09-22 13:02:40 +1000
message:
[merge] additional python2.5 fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060901035507-463cb84e88732d46
parent: mbp at sourcefrog.net-20060901034717-a9a7d359fc7e3191
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Fri 2006-09-01 13:55:07 +1000
message:
python2.5 apparently has trouble with unicode options
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060901034717-a9a7d359fc7e3191
parent: mbp at sourcefrog.net-20060815083351-f4ba9f92ba8d37eb
parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Fri 2006-09-01 13:47:17 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060815083351-f4ba9f92ba8d37eb
parent: mbp at sourcefrog.net-20060815074912-8d4151cf41ea18e9
parent: pqm at pqm.ubuntu.com-20060815050217-d2df7c83d6c5eeca
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Tue 2006-08-15 18:33:51 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060815074912-8d4151cf41ea18e9
parent: pqm at pqm.ubuntu.com-20060814042957-3fa43995db57512a
parent: sandals at crustytoothpaste.ath.cx-20060428142637-289a48babda94a8a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Tue 2006-08-15 17:49:12 +1000
message:
[merge] [broken] python2.5 fixes
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060428142637-289a48babda94a8a
parent: sandals at crustytoothpaste.ath.cx-20060428140743-3904d8780a941074
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Fri 2006-04-28 14:26:37 +0000
message:
Change a repository test to explicitly convert to a list.
In python2.5, generator objects apparently cannot be autoconverted to a list.
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060428140743-3904d8780a941074
parent: sandals at crustytoothpaste.ath.cx-20060427012324-d645b696893446d6
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Fri 2006-04-28 14:07:43 +0000
message:
Canonicalize the exception name to the python2.4 form, which is more
user-friendly.
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060427012324-d645b696893446d6
parent: sandals at crustytoothpaste.ath.cx-20060427001121-e0e728124aebfcb1
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Thu 2006-04-27 01:23:24 +0000
message:
Change the BzrNewError super invocation to a direct call, so it works with 2.4.
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060427001121-e0e728124aebfcb1
parent: pqm at pqm.ubuntu.com-20060424103128-a637f56a7c529bad
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Thu 2006-04-27 00:11:21 +0000
message:
Add a workaround for usage of the args attribute in exceptions.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922023241-474fdb7540c8cf2e
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
parent: marienz at gentoo.org-20060922001708-b5db1381393a1f0a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: marien.python2.5
timestamp: Fri 2006-09-22 12:32:41 +1000
message:
[merge] python2.5 fixes from Marien
------------------------------------------------------------
merged: marienz at gentoo.org-20060922001708-b5db1381393a1f0a
parent: marienz at gentoo.org-20060921230654-77cb3d28e97ffb9f
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 02:17:08 +0200
message:
Fix another python 2.5 issue.
------------------------------------------------------------
merged: marienz at gentoo.org-20060921230654-77cb3d28e97ffb9f
parent: marienz at gentoo.org-20060921230619-910d2ec258cba83d
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 01:06:54 +0200
message:
Fixes for python 2.5.
------------------------------------------------------------
merged: marienz at gentoo.org-20060921230619-910d2ec258cba83d
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 01:06:19 +0200
message:
Make the test runner finish running if a doctest fails.
More information about the bazaar-commits
mailing list