Rev 4423: (jam) restore a compatibility module at bzrlib.util.bencode (bug in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4423
revision-id: pqm at pqm.ubuntu.com-20090610010249-5iyq9oics6tysru4
parent: pqm at pqm.ubuntu.com-20090609154318-hfu5yjpsck9zgg7r
parent: john at arbash-meinel.com-20090609141923-c03y68e6u6fd1m4i
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-06-10 02:02:49 +0100
message:
  (jam) restore a compatibility module at bzrlib.util.bencode (bug
  	#385212)
added:
  bzrlib/util/bencode.py         bencode.py-20090609141817-jtvhqq6vyryjoeky-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 4420.2.2
    revision-id: john at arbash-meinel.com-20090609141923-c03y68e6u6fd1m4i
    parent: john at arbash-meinel.com-20090609141841-3c01lqijv35v1hkt
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: 1.16-bencode-compat-385212
    timestamp: Tue 2009-06-09 09:19:23 -0500
    message:
      Update NEWS about deprecation of bzrlib.utils.bencode
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 4420.2.1
    revision-id: john at arbash-meinel.com-20090609141841-3c01lqijv35v1hkt
    parent: pqm at pqm.ubuntu.com-20090609074559-97mi1flqtxzh6aj3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: 1.16-bencode-compat-385212
    timestamp: Tue 2009-06-09 09:18:41 -0500
    message:
      Add a compatibility thunk for bzrlib.util.bencode (bug #385212)
    added:
      bzrlib/util/bencode.py         bencode.py-20090609141817-jtvhqq6vyryjoeky-1
=== modified file 'NEWS'
--- a/NEWS	2009-06-09 06:47:54 +0000
+++ b/NEWS	2009-06-09 14:19:23 +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'
--- a/bzrlib/util/bencode.py	1970-01-01 00:00:00 +0000
+++ b/bzrlib/util/bencode.py	2009-06-09 14:18:41 +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 *