Merge lp:~jameinel/bzr/1.16-bencode-compat-385212 into lp:~bzr/bzr/trunk-old

[John A Meinel]

[John A Meinel (jameinel)]

This adds a backwards compatibility code with deprecation for "bzrlib.util.bencode"

It is a small helper for both bzr-gtk and the MySQL plugin that used bzrlib.util.bencode directly.

Importing the function raises the deprecation warning. The other possibility was to manually wrap all the imported objects with deprecations, but I thought this would be easier.

[Andrew Bennetts (spiv)]

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-06-09 06:47:54 +0000
+++ NEWS	2009-06-09 21:35:10 +0000
@@ -55,8 +55,8 @@
   (Ian Clatworthy)
 
 * Pyrex version of ``bencode`` support. This provides optimized support
-  for both encoding and decoding, and is now found at ``bzrlib.bencode``,
-  rather than ``bzrlib.utils.bencode``.
+  for both encoding and decoding, and is now found at ``bzrlib.bencode``.
+  ``bzrlib.utils.bencode`` is now deprecated.
   (Alexander Belchenko, Jelmer Vernooij, John Arbash Meinel)
 
 

=== added file 'bzrlib/util/bencode.py'
--- bzrlib/util/bencode.py	1970-01-01 00:00:00 +0000
+++ bzrlib/util/bencode.py	2009-06-09 21:35:10 +0000
@@ -0,0 +1,24 @@
+# Copyright (C) 2009 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from bzrlib import symbol_versioning
+
+dep_warning = symbol_versioning.deprecated_in((1, 16, 0)) % (
+    'bzrlib.util.bencode',) + '\n  Use bzrlib.bencode instead'
+
+symbol_versioning.warn(dep_warning, DeprecationWarning)
+
+from bzrlib.bencode import *