~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-11 16:35:34 UTC
  • mfrom: (5848.2.2 2.4-uses-py26)
  • Revision ID: pqm@pqm.ubuntu.com-20110511163534-yz28ddqwa5cicukr
(jameinel) Finally break compatibility with python 2.4/5. bzr-2.4.0 will be
 officially only compatible with python2.6/7 (John A Meinel)

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