comparison tests/run-tests.py @ 44449:ff72bd52d56a

tests: avoid implicit conversion of str to unicode

On Python 2, str.encode('utf-8') implicitly converts the string to unicode and
then back to str.

Using _sys2bytes() ensures that opt is only encoded on Python 3, where opt is
unicode.

Although contrived, before this change, a UnicodeDecodeError could be triggered
on Python 2 when passing non-ascii values to --extra-config-opt.

44448:55c443fcb4fc

                'HGCATAPULTSERVERPIPE', os.devnull
            )

        extraextensions = []
        for opt in self._extraconfigopts:
            section, key = opt.encode('utf-8').split(b'.', 1)
            if section != 'extensions':
                continue
            name = key.split(b'=', 1)[0]
            extraextensions.append(name)

            hgrc.write(b'address = localhost\n')
            hgrc.write(b'ipv6 = %r\n' % self._useipv6)
            hgrc.write(b'server-header = testing stub value\n')

            for opt in self._extraconfigopts:
                section, key = opt.encode('utf-8').split(b'.', 1)
                assert b'=' in key, (
                    'extra config opt %s must ' 'have an = for assignment' % opt
                )
                hgrc.write(b'[%s]\n%s\n' % (section, key))

44449:ff72bd52d56a

                'HGCATAPULTSERVERPIPE', os.devnull
            )

        extraextensions = []
        for opt in self._extraconfigopts:
            section, key = _sys2bytes(opt).split(b'.', 1)
            if section != 'extensions':
                continue
            name = key.split(b'=', 1)[0]
            extraextensions.append(name)

            hgrc.write(b'address = localhost\n')
            hgrc.write(b'ipv6 = %r\n' % self._useipv6)
            hgrc.write(b'server-header = testing stub value\n')

            for opt in self._extraconfigopts:
                section, key = _sys2bytes(opt).split(b'.', 1)
                assert b'=' in key, (
                    'extra config opt %s must ' 'have an = for assignment' % opt
                )
                hgrc.write(b'[%s]\n%s\n' % (section, key))