← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_osutils_encodings.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-06-05 04:05:05 UTC
  • mfrom: (3473.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080605040505-i9kqxg2fps2qjdi0
Add the 'alias' command (Tim Penhey)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils_encodings.py
21
21
import os
22
22
import sys
23
23
 
 
24
import bzrlib
24
25
from bzrlib import (
25
26
    errors,
26
27
    osutils,
77
78
        self._stdout = sys.stdout
78
79
        self._stderr = sys.stderr
79
80
        self._stdin = sys.stdin
80
 
        self._user_encoding = osutils._cached_user_encoding
 
81
        self._user_encoding = bzrlib.user_encoding
81
82
 
82
83
        self.addCleanup(self._reset)
83
84
 
93
94
        sys.stderr.encoding = stderr_encoding
94
95
        sys.stdin = StringIOWrapper()
95
96
        sys.stdin.encoding = stdin_encoding
96
 
        osutils._cached_user_encoding = user_encoding
 
97
        bzrlib.user_encoding = user_encoding
97
98
        if enable_fake_encodings:
98
99
            fake_codec.add(stdout_encoding)
99
100
            fake_codec.add(stderr_encoding)
103
104
        sys.stdout = self._stdout
104
105
        sys.stderr = self._stderr
105
106
        sys.stdin = self._stdin
106
 
        osutils._cached_user_encoding = self._user_encoding
 
107
        bzrlib.user_encoding = self._user_encoding
107
108
 
108
109
    def test_get_terminal_encoding(self):
109
110
        self.make_wrapped_streams('stdout_encoding',
118
119
        self.assertEqual('stdin_encoding', osutils.get_terminal_encoding())
119
120
 
120
121
        sys.stdin.encoding = None
121
 
        # and in the worst case, use osutils.get_user_encoding()
 
122
        # and in the worst case, use bzrlib.user_encoding
122
123
        self.assertEqual('user_encoding', osutils.get_terminal_encoding())
123
124
 
124
125
    def test_terminal_cp0(self):