comparison tests/run-tests.py @ 33710:2e43c5cd57a7

tests: fix up test-run-tests failures on Python 3.6

Some of the recent work on run-tests.py didn't work on Python 3. This
fixes the regressions.

Differential Revision: https://phab.mercurial-scm.org/D270

33709:511d6ae462f3

if sys.version_info > (3, 5, 0):
    PYTHON3 = True
    xrange = range # we use xrange in one place, and we'd rather not use range
    def _bytespath(p):
        return p.encode('utf-8')

    def _strpath(p):
        return p.decode('utf-8')

elif sys.version_info >= (3, 0, 0):
    print('%s is only supported on Python 3.5+ and 2.7, not %s' %
          (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))

                        if el.endswith(b" (?)\n"):
                            optional.append(i)
                        else:
                            m = optline.match(el)
                            if m:
                                conditions = [c for c in m.group(2).split(' ')]

                                if not self._hghave(conditions)[0]:
                                    optional.append(i)

                    i += 1

                retry = "retry"
                el = el[:-5] + b"\n"
            else:
                m = optline.match(el)
                if m:
                    conditions = [c for c in m.group(2).split(' ')]

                    el = m.group(1) + b"\n"
                    if not self._hghave(conditions)[0]:
                        retry = "retry"    # Not required by listed features

33710:2e43c5cd57a7

if sys.version_info > (3, 5, 0):
    PYTHON3 = True
    xrange = range # we use xrange in one place, and we'd rather not use range
    def _bytespath(p):
        if p is None:
            return p
        return p.encode('utf-8')

    def _strpath(p):
        if p is None:
            return p
        return p.decode('utf-8')

elif sys.version_info >= (3, 0, 0):
    print('%s is only supported on Python 3.5+ and 2.7, not %s' %
          (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))

                        if el.endswith(b" (?)\n"):
                            optional.append(i)
                        else:
                            m = optline.match(el)
                            if m:
                                conditions = [
                                    c for c in m.group(2).split(b' ')]

                                if not self._hghave(conditions)[0]:
                                    optional.append(i)

                    i += 1

                retry = "retry"
                el = el[:-5] + b"\n"
            else:
                m = optline.match(el)
                if m:
                    conditions = [c for c in m.group(2).split(b' ')]

                    el = m.group(1) + b"\n"
                    if not self._hghave(conditions)[0]:
                        retry = "retry"    # Not required by listed features