Does not work with bzr 2.6b1

[Lele Gaifax]

Given that “pip install bzr” currently picks 2.6b1, I got the following traceback:

bzr: ERROR: exceptions.ImportError: cannot import name tree_files

Traceback (most recent call last):
  File "/home/lele/wip/story-1427/lib/python2.6/site-packages/bzr-2.6b1-py2.6-linux-x86_64.egg/bzrlib/commands.py", line 930, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/home/lele/wip/story-1427/lib/python2.6/site-packages/bzr-2.6b1-py2.6-linux-x86_64.egg/bzrlib/commands.py", line 1141, in run_bzr
    ret = run(*run_argv)
  File "/home/lele/wip/story-1427/lib/python2.6/site-packages/bzr-2.6b1-py2.6-linux-x86_64.egg/bzrlib/commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/lele/wip/story-1427/lib/python2.6/site-packages/bzr-2.6b1-py2.6-linux-x86_64.egg/bzrlib/commands.py", line 697, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/home/lele/wip/story-1427/lib/python2.6/site-packages/bzr-2.6b1-py2.6-linux-x86_64.egg/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/home/lele/wip/story-1427/lib/python2.6/site-packages/bzr-2.6b1-py2.6-linux-x86_64.egg/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/lele/.bazaar/plugins/interactive/__init__.py", line 102, in run
    source = BzrPatchSource(None, selected_list)
  File "/home/lele/.bazaar/plugins/interactive/patchsource.py", line 45, in __init__
    from bzrlib.builtins import tree_files
ImportError: cannot import name tree_files

bzr 2.6b1 on python 2.6.6 (Linux-2.6.35-32-generic-x86_64-with-
    Ubuntu-10.10-maverick)
arguments: ['/home/lele/wip/story-1427/bin/bzr', 'ci', '-i', '-m',
    'Sorted attribute names import', 'src/core/entity.py']
plugins: bash_completion[2.6b1], changelog_merge[2.6b1], interactive[1.2.0],
    launchpad[2.6b1], netrc_credential_store[2.6b1], news_merge[2.6b1],
    po_merge[2.6b1], tiplog[0.0.3dev], weave_fmt[2.6b1]
encoding: 'utf-8', fsenc: 'UTF-8', lang: 'it_IT.UTF-8'

[Sunil Mohan Adapa (f-su7il-g)]

The following patch fixed the problem for me.