Rev 5665: (jelmer) Directly import cStringIO in bzrlib.config to prevent lazy import in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.3/

[Patch Queue Manager]

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

------------------------------------------------------------
revno: 5665 [merge]
revision-id: pqm at pqm.ubuntu.com-20111219122856-w2pwurat6tsj5mx7
parent: pqm at pqm.ubuntu.com-20111110171354-z6nw3oudd4e7p863
parent: jelmer at canonical.com-20111219112230-w97b7atpxui1al07
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Mon 2011-12-19 12:28:56 +0000
message:
  (jelmer) Directly import cStringIO in bzrlib.config to prevent lazy import
   scope errors. (Jelmer Vernooij)
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	2011-04-01 03:07:34 +0000
+++ b/bzrlib/config.py	2011-12-19 11:22:30 +0000
@@ -62,6 +62,7 @@
 up=pull
 """
 
+from cStringIO import StringIO
 import os
 import string
 import sys
@@ -73,7 +74,6 @@
 import errno
 import fnmatch
 import re
-from cStringIO import StringIO
 
 import bzrlib
 from bzrlib import (

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-11-10 10:46:54 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-12-19 11:22:30 +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)