This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2131

py3: replace file() with open() in test-encoding-align.t
ClosedPublic

Authored by pulkit on Feb 11 2018, 7:42 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGaf9cb761b5f3: py3: replace file() with open() in test-encoding-align.t
Summary

file() is not present in Python 3.
This patch also makes sure we write bytes in Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Feb 11 2018, 7:42 AM
yuja requested changes to this revision.Feb 11 2018, 9:06 AM
yuja added a subscriber: yuja.

Perhaps these open()s need 'b' because we're testing non-ascii strings.

This revision now requires changes to proceed.Feb 11 2018, 9:06 AM
pulkit edited the summary of this revision. (Show Details)Feb 12 2018, 3:48 AM
pulkit updated this revision to Diff 5480.
yuja accepted this revision.Feb 12 2018, 5:45 AM
This revision is now accepted and ready to land.Feb 12 2018, 5:45 AM
Closed by commit rHGaf9cb761b5f3: py3: replace file() with open() in test-encoding-align.t (authored by pulkit). · Explain WhyFeb 12 2018, 6:07 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-encoding-align.t (14 lines)

Diff 5484

tests/test-encoding-align.t

Test alignment of multibyte characters Test alignment of multibyte characters
$ HGENCODING=utf-8 $ HGENCODING=utf-8
$ export HGENCODING $ export HGENCODING
$ hg init t $ hg init t
$ cd t $ cd t
$ $PYTHON << EOF $ $PYTHON << EOF
> # (byte, width) = (6, 4) > # (byte, width) = (6, 4)
> s = "\xe7\x9f\xad\xe5\x90\x8d" > s = b"\xe7\x9f\xad\xe5\x90\x8d"
> # (byte, width) = (7, 7): odd width is good for alignment test > # (byte, width) = (7, 7): odd width is good for alignment test
> m = "MIDDLE_" > m = b"MIDDLE_"
> # (byte, width) = (18, 12) > # (byte, width) = (18, 12)
> l = "\xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d" > l = b"\xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d"
> f = file('s', 'w'); f.write(s); f.close() > f = open('s', 'wb'); f.write(s); f.close()
> f = file('m', 'w'); f.write(m); f.close() > f = open('m', 'wb'); f.write(m); f.close()
> f = file('l', 'w'); f.write(l); f.close() > f = open('l', 'wb'); f.write(l); f.close()
> # instant extension to show list of options > # instant extension to show list of options
> f = file('showoptlist.py', 'w'); f.write("""# encoding: utf-8 > f = open('showoptlist.py', 'wb'); f.write(b"""# encoding: utf-8
> from mercurial import registrar > from mercurial import registrar
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> >
> @command(b'showoptlist', > @command(b'showoptlist',
> [('s', 'opt1', '', 'short width' + ' %(s)s' * 8, '%(s)s'), > [('s', 'opt1', '', 'short width' + ' %(s)s' * 8, '%(s)s'),
> ('m', 'opt2', '', 'middle width' + ' %(m)s' * 8, '%(m)s'), > ('m', 'opt2', '', 'middle width' + ' %(m)s' * 8, '%(m)s'),
> ('l', 'opt3', '', 'long width' + ' %(l)s' * 8, '%(l)s')], > ('l', 'opt3', '', 'long width' + ' %(l)s' * 8, '%(l)s')],