Rev 4692: (mbp) remove circular import from bzrlib/__init__; bump API version in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4692 [merge]
revision-id: pqm at pqm.ubuntu.com-20090916074747-bd25xjyualxo1zei
parent: pqm at pqm.ubuntu.com-20090916025214-6cyz9179xs7f1w70
parent: mbp at sourcefrog.net-20090916070738-ixva28fqfrdd2ugr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-09-16 08:47:47 +0100
message:
  (mbp) remove circular import from bzrlib/__init__; bump API version
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2009-09-16 02:52:14 +0000
+++ b/NEWS	2009-09-16 07:47:47 +0000
@@ -94,6 +94,9 @@
 API Changes
 ***********
 
+* ``bzrlib.user_encoding`` has been removed; use
+  ``bzrlib.osutils.get_user_encoding`` instead.  (Martin Pool)
+
 * ``bzrlib.tests`` now uses ``stopTestRun`` for its ``TestResult``
   subclasses - the same as python's unittest module. (Robert Collins)
 

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2009-09-15 02:57:23 +0000
+++ b/bzrlib/__init__.py	2009-09-16 07:47:47 +0000
@@ -31,16 +31,10 @@
     import bzrlib.lazy_regex
     bzrlib.lazy_regex.install_lazy_compile()
 
-from bzrlib.osutils import get_user_encoding
-
 
 IGNORE_FILENAME = ".bzrignore"
 
 
-# XXX: Deprecated as of bzr-1.17 use osutils.get_user_encoding() directly
-user_encoding = get_user_encoding()
-
-
 __copyright__ = "Copyright 2005, 2006, 2007, 2008, 2009 Canonical Ltd."
 
 # same format as sys.version_info: "A tuple containing the five components of
@@ -53,7 +47,7 @@
 version_info = (2, 1, 0, 'dev', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
-api_minimum_version = (1, 17, 0)
+api_minimum_version = (2, 1, 0)
 
 
 def _format_version_tuple(version_info):