/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 breezy/tests/test_selftest.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_selftest.py
64
64
    )
65
65
from ..sixish import (
66
66
    StringIO,
 
67
    text_type,
67
68
    )
68
69
from ..symbol_versioning import (
69
70
    deprecated_function,
1902
1903
 
1903
1904
    def test_assert_isinstance(self):
1904
1905
        self.assertIsInstance(2, int)
1905
 
        self.assertIsInstance(u'', basestring)
 
1906
        self.assertIsInstance(u'', (str, text_type))
1906
1907
        e = self.assertRaises(AssertionError, self.assertIsInstance, None, int)
1907
1908
        self.assertEqual(str(e),
1908
1909
            "None is an instance of <type 'NoneType'> rather than <type 'int'>")