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

[Jelmer Vernooij]

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.

[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

=== modified file 'bzrlib/config.py'
--- bzrlib/config.py	2011-12-16 14:04:01 +0000
+++ bzrlib/config.py	2011-12-18 02:57:24 +0000
@@ -72,6 +72,7 @@
 up=pull
 """
 
+from cStringIO import StringIO
 import os
 import sys
 
@@ -81,7 +82,6 @@
 lazy_import(globals(), """
 import fnmatch
 import re
-from cStringIO import StringIO
 
 from bzrlib import (
     atomicfile,

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2011-12-15 14:47:22 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2011-12-18 02:57:24 +0000
@@ -53,6 +53,9 @@
 * Allow configuration option default value to be a python callable at
   registration. (Vincent Ladeuil, #832064)
 
+* cStringIO is now unconditionally imported in ``bzrlib.config``.
+  (Jelmer Vernooij, #905361)
+
 * Create obsolete_packs directory when repacking if it does not
   exist. (Jonathan Riddell, Jelmer Vernooij, #314314)