Rev 3746: merge down-thread in file:///v/home/vila/src/bzr/experimental/bzr-py26-compat/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/experimental/bzr-py26-compat/

------------------------------------------------------------
revno: 3746
revision-id: v.ladeuil+lp at free.fr-20080929080859-pbtex6ozsk32a2au
parent: v.ladeuil+lp at free.fr-20080929071237-fppx7gg44vasd8ta
parent: v.ladeuil+lp at free.fr-20080929080848-3j0bmihhs92tox1v
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: py26-compat
timestamp: Mon 2008-09-29 10:08:59 +0200
message:
  merge down-thread
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3742.1.2
    revision-id: v.ladeuil+lp at free.fr-20080929080848-3j0bmihhs92tox1v
    parent: v.ladeuil+lp at free.fr-20080929071021-y67wj60j1hpx9dek
    parent: v.ladeuil+lp at free.fr-20080929080434-h3j35vswi87670cp
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    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: v.ladeuil+lp at free.fr-20080929080434-h3j35vswi87670cp
    parent: v.ladeuil+lp at free.fr-20080929070943-bw01lbtpek13rub2
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    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
-------------- next part --------------
=== 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)