comparison hgext/convert/cvsps.py @ 51146:de9cbc5a1450 stable

py3: pass unicode strings to hasattr() throughout

I guess we missed these instances because they're not covered by tests.

This is a graft of 1625fe807c04a490f9516bc8e14140e570c06146 that landed on
default.

51132:d45afa07564c

        try:
            ui.note(_(b'reading cvs log cache %s\n') % cachefile)
            oldlog = pickle.load(open(cachefile, b'rb'))
            for e in oldlog:
                if not (
                    hasattr(e, b'branchpoints')
                    and hasattr(e, b'commitid')
                    and hasattr(e, b'mergepoint')
                ):
                    ui.status(_(b'ignoring old cache\n'))
                    oldlog = []
                    break

51146:de9cbc5a1450

        try:
            ui.note(_(b'reading cvs log cache %s\n') % cachefile)
            oldlog = pickle.load(open(cachefile, b'rb'))
            for e in oldlog:
                if not (
                    hasattr(e, 'branchpoints')
                    and hasattr(e, 'commitid')
                    and hasattr(e, 'mergepoint')
                ):
                    ui.status(_(b'ignoring old cache\n'))
                    oldlog = []
                    break