← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-09 12:49:08 UTC
  • mto: This revision was merged to the branch mainline in revision 6060.
  • Revision ID: v.ladeuil+lp@free.fr-20110809124908-aok36t6x2y0thov1
Fix news entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/__init__.py
47
47
from bzrlib.lazy_import import lazy_import
48
48
lazy_import(globals(), """
49
49
from bzrlib import (
50
 
    config,
51
50
    osutils,
52
51
    progress,
53
52
    trace,
248
247
        """
249
248
        # XXX: is the caller supposed to close the resulting object?
250
249
        if encoding is None:
251
 
            encoding = config.GlobalStack().get('output_encoding')
 
250
            from bzrlib import config
 
251
            encoding = config.GlobalConfig().get_user_option(
 
252
                'output_encoding')
252
253
        if encoding is None:
253
254
            encoding = osutils.get_terminal_encoding(trace=True)
254
255
        if encoding_type is None: