Merge lp:~jelmer/bzr/direct-cstringio-import into lp:bzr/2.3

[Jelmer Vernooij]

Directly import cStringIO in bzrlib.config to prevent lazy import scope errors.

Directly import cStringIO in bzrlib.config, rather than through
lazy_import. This fixes a IllegalUseOfScopeReplacer error that Adi was
running into.

We use cStringIO heavily, so - like e.g. the os module - it seems impossible
to avoid it anyway.

(resubmitted against 2.3)

[Martin Packman (gz)]

Yeah, this is the change I was thinking of, but would retarget to 2.3 as it's safe and that's the version being used by the reporter. For trunk, we want the full fix of changing lazy imports to be less thread-ignorant, as in:

<https://code.launchpad.net/~gagern/bzr/bug396819-lazy_import-threadsafe/+merge/73475>

review: Approve

[Martin Pool (mbp)]

vote approve

[Martin Packman (gz)]

Thanks!

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/config.py'
--- bzrlib/config.py	2011-04-01 03:07:34 +0000
+++ bzrlib/config.py	2011-12-19 11:28:27 +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'
--- doc/en/release-notes/bzr-2.3.txt	2011-11-10 10:46:54 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2011-12-19 11:28:27 +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)