At file:///v/home/vila/src/bzr/experimental/bzr-py26-compat/
------------------------------------------------------------
revno: 3744
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: http-server-select-exception
timestamp: Mon 2008-09-29 10:08:48 +0200
message:
merge down-thread
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3741.1.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: deprecations
timestamp: Mon 2008-09-29 10:04:34 +0200
message:
Martin's review feedback.
* bzrlib/tests/__init__.py:
(TestCase.callCatchWarnings): python-2.6 wants a 'line' keyword
argument.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2008-09-25 01:11:30 +0000
+++ b/bzrlib/tests/__init__.py 2008-09-29 08:04:34 +0000
@@ -1149,7 +1149,7 @@
# warnings. It's the easiest way to insulate ourselves from -Werror,
# though. -- Andrew, 20071062
wlist = []
- def _catcher(message, category, filename, lineno, file=None):
+ def _catcher(message, category, filename, lineno, file=None,
line=None):
# despite the name, 'message' is normally(?) a Warning subclass
# instance
wlist.append(message)
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
