~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
 
68
68
    def test_nonascii_optparse(self):
69
69
        """Reasonable error raised when non-ascii in option name"""
70
 
        if sys.version_info < (2,5):
71
 
            error_re = 'no such option'
72
 
        else:
73
 
            error_re = 'Only ASCII permitted in option names'
 
70
        error_re = 'Only ASCII permitted in option names'
74
71
        out = self.run_bzr_error([error_re], ['st',u'-\xe4'])
75
72
 
76
73