/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/osutils.py

  • Committer: Breezy landing bot
  • Author(s): Martin
  • Date: 2017-06-15 23:20:39 UTC
  • mfrom: (6695.3.2 py3_lose_basestring)
  • Revision ID: breezy.the.bot@gmail.com-20170615232039-hdbwomymwwq429io
Remove remaining uses of basestring

Merged from https://code.launchpad.net/~gz/brz/py3_lose_basestring/+merge/325706

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/osutils.py
1391
1391
    :return: None or a utf8 revision id.
1392
1392
    """
1393
1393
    if (unicode_or_utf8_string is None
1394
 
        or unicode_or_utf8_string.__class__ == str):
 
1394
        or unicode_or_utf8_string.__class__ == bytes):
1395
1395
        return unicode_or_utf8_string
1396
1396
    raise TypeError('Unicode revision ids are no longer supported. '
1397
1397
                    'Revision id generators should be creating utf8 revision '
1409
1409
    :return: None or a utf8 file id.
1410
1410
    """
1411
1411
    if (unicode_or_utf8_string is None
1412
 
        or unicode_or_utf8_string.__class__ == str):
 
1412
        or unicode_or_utf8_string.__class__ == bytes):
1413
1413
        return unicode_or_utf8_string
1414
1414
    raise TypeError('Unicode file ids are no longer supported. '
1415
1415
                    'File id generators should be creating utf8 file ids.')