Rev 6065: (vila) Merge 2.3 into 2.4 (Vincent Ladeuil) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.4/
Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Jan 13 11:31:34 UTC 2012
At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.4/
------------------------------------------------------------
revno: 6065 [merge]
revision-id: pqm at pqm.ubuntu.com-20120113113133-eh846y7w12s9hm9s
parent: pqm at pqm.ubuntu.com-20111205134400-7yd1ic4aif8wzv5h
parent: v.ladeuil+lp at free.fr-20120112232731-a3833nn9p9yc8mml
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.4
timestamp: Fri 2012-01-13 11:31:33 +0000
message:
(vila) Merge 2.3 into 2.4 (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 2011-09-09 12:42:32 +0000
+++ b/bzrlib/config.py 2012-01-12 23:27:31 +0000
@@ -71,6 +71,7 @@
up=pull
"""
+from cStringIO import StringIO
import os
import string
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.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt 2011-11-10 17:24:13 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt 2012-01-12 23:27:31 +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)
More information about the bazaar-commits
mailing list