/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_osutils_encodings.py

  • Committer: Vincent Ladeuil
  • Date: 2010-01-25 17:48:22 UTC
  • mto: (4987.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100125174822-nce4l19sbwx83jvq
Deploying the new overrideAttr facility further reduces the complexity
and make the code clearer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils_encodings.py
75
75
 
76
76
    def setUp(self):
77
77
        TestCase.setUp(self)
78
 
        self.addAttrCleanup(sys, 'stdin')
79
 
        self.addAttrCleanup(sys, 'stdout')
80
 
        self.addAttrCleanup(sys, 'stderr')
81
 
        self.addAttrCleanup(osutils, '_cached_user_encoding')
 
78
        self.overrideAttr(sys, 'stdin')
 
79
        self.overrideAttr(sys, 'stdout')
 
80
        self.overrideAttr(sys, 'stderr')
 
81
        self.overrideAttr(osutils, '_cached_user_encoding')
82
82
 
83
83
    def make_wrapped_streams(self,
84
84
                             stdout_encoding,
150
150
 
151
151
    def setUp(self):
152
152
        TestCase.setUp(self)
153
 
        self.addAttrCleanup(locale, 'getpreferredencoding')
 
153
        self.overrideAttr(locale, 'getpreferredencoding')
154
154
        self.addCleanup(osutils.set_or_unset_env,
155
155
                        'LANG', os.environ.get('LANG'))
156
 
        self.addAttrCleanup(sys, 'stderr')
157
 
        sys.stderr = StringIOWrapper()
 
156
        self.overrideAttr(sys, 'stderr', StringIOWrapper())
158
157
 
159
158
    def test_get_user_encoding(self):
160
159
        def f():