Rev 6438: (vila) Merge 2.4 into 2.5 (Vincent Ladeuil) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

------------------------------------------------------------
revno: 6438 [merge]
revision-id: pqm at pqm.ubuntu.com-20120116162142-tkppbzpcvwtrvxnd
parent: pqm at pqm.ubuntu.com-20120109122041-5efxdgkusn0a319w
parent: v.ladeuil+lp at free.fr-20120113150542-510rp0ep0fa2zqoz
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.5
timestamp: Mon 2012-01-16 16:21:42 +0000
message:
  (vila) Merge 2.4 into 2.5 (Vincent Ladeuil)
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2012-01-09 12:20:41 +0000
+++ b/bzrlib/config.py	2012-01-13 15:05:42 +0000
@@ -73,7 +73,7 @@
 """
 
 from __future__ import absolute_import
-
+from cStringIO import StringIO
 import os
 import sys
 
@@ -83,7 +83,6 @@
 lazy_import(globals(), """
 import fnmatch
 import re
-from cStringIO import StringIO
 
 from bzrlib import (
     atomicfile,

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-12-10 21:21:31 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2012-01-13 15:05:42 +0000
@@ -35,6 +35,9 @@
 * Cope cleanly with buggy HTTP proxies that close the socket in the middle
   of a multipart response.  (Martin Pool, #198646).
 
+* cStringIO is now unconditionally imported in ``bzrlib.config``.
+  (Jelmer Vernooij, #905361)
+
 * Fix "Unprintable exception" error when a RetryWithNewPacks error is
   displayed.  (Andrew Bennetts)