← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_commit.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-29 16:21:13 UTC
  • mfrom: (5325 +trunk)
  • mto: (5247.1.12 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100629162113-xa6y33u17mfi024v
Merge bzr.dev into cleanup resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
129
129
        # by ui.text.show_warning
130
130
        default_get_terminal_enc = osutils.get_terminal_encoding
131
131
        try:
132
 
            osutils.get_terminal_encoding = lambda: 'ascii'
 
132
            osutils.get_terminal_encoding = lambda trace=None: 'ascii'
133
133
            file_name = u'foo\u1234'
134
134
            open(file_name, 'w').write('hello world')
135
135
            self.run_bzr(['add'])