move of bzrlib.util.bencode into bzrlib.bencode breaks bzr-gtk

[GuilhemBichot]

In revision
4410 revid:<email address hidden>
of bzr.dev, bencode.py moved from bzrlib.util to bzrlib. Thus, code like:
commit.py:from bzrlib.util import bencode
revisionview.py:from bzrlib.util.bencode import bdecode
of bzr-gtk breaks. bzr-gtk needs an update, or bzrlib needs a backward compatibility feature...

[GuilhemBichot (guilhem-bichot)]

I had to do such fix in our MySQL-internal plugin:
-from bzrlib.util import bencode
+try:
+ from bzrlib import bencode
+except ImportError: # bencode was in "util" in the past
+ from bzrlib.util import bencode
because it has to work with pre-rename and post-rename bzr (colleagues may upgrade our plugin without upgrading bzr).
Maybe bzr-gtk needs to do the same?

[GuilhemBichot (guilhem-bichot)]

Hi Jelmer. Probably not a complete fix: after pulling bzr-gtk (revno 644), I still see
./revisionview.py:from bzrlib.util.bencode import bdecode
./tests/test_commit.py:from bzrlib.util import bencode
./tests/test_revisionview.py:from bzrlib.util import bencode
./tests/test_linegraph.py:from bzrlib.util import bencode
For example "bzr gmissing" fails.

[John A Meinel (jameinel)]

I did submit: https://code.edge.launchpad.net/~jameinel/bzr/1.16-bencode-compat-385212/+merge/7238

which would at least allow backwards compatibility. It will cause DeprecationWarnings in development versions (those are suppressed in release versions).

Of course, ProgressBarStack has been deprecated since 1.12, and bzr-gtk still used it...

Anyway, changing the imports is the 'correct' thing to do, I just thought I'd mention that likely 1.16 will have backwards compatibility anyway.

[Jonathan Lange (jml)]

Looks like this has landed on trunk already.