This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2113

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

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd7238d125aa2: py3: replace file() with open() in test-win32text.t
Summary

This patch also adds b'' prefix to make sure we write bytes on 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:39 AM
Closed by commit rHGd7238d125aa2: py3: replace file() with open() in test-win32text.t (authored by pulkit). · Explain WhyFeb 11 2018, 9:04 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-win32text.t (12 lines)

Diff 5402

tests/test-win32text.t

$ hg init t $ hg init t
$ cd t $ cd t
$ cat > unix2dos.py <<EOF $ cat > unix2dos.py <<EOF
> import sys > import sys
> >
> for path in sys.argv[1:]: > for path in sys.argv[1:]:
> data = file(path, 'rb').read() > data = open(path, 'rb').read()
> data = data.replace('\n', '\r\n') > data = data.replace(b'\n', b'\r\n')
> file(path, 'wb').write(data) > open(path, 'wb').write(data)
> EOF > EOF
$ echo '[hooks]' >> .hg/hgrc $ echo '[hooks]' >> .hg/hgrc
$ echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc $ echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
$ echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc $ echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
$ cat .hg/hgrc $ cat .hg/hgrc
[hooks] [hooks]
pretxncommit.crlf = python:hgext.win32text.forbidcrlf pretxncommit.crlf = python:hgext.win32text.forbidcrlf
pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
[255] [255]
$ hg revert -a $ hg revert -a
forgetting d/f2 forgetting d/f2
$ rm d/f2 $ rm d/f2
$ hg rem f $ hg rem f
$ hg ci -m 4 $ hg ci -m 4
$ $PYTHON -c 'file("bin", "wb").write("hello\x00\x0D\x0A")' $ $PYTHON -c 'open("bin", "wb").write(b"hello\x00\x0D\x0A")'
$ hg add bin $ hg add bin
$ hg ci -m 5 $ hg ci -m 5
$ hg log -v $ hg log -v
changeset: 5:f0b1c8d75fce changeset: 5:f0b1c8d75fce
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
files: bin files: bin
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
files: f files: f
description: description:
1 1
$ rm .hg/hgrc $ rm .hg/hgrc
$ (echo some; echo text) > f3 $ (echo some; echo text) > f3
$ $PYTHON -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")' $ $PYTHON -c 'open("f4.bat", "wb").write(b"rem empty\x0D\x0A")'
$ hg add f3 f4.bat $ hg add f3 f4.bat
$ hg ci -m 6 $ hg ci -m 6
$ cat bin $ cat bin
hello\x00\r (esc) hello\x00\r (esc)
$ cat f3 $ cat f3
some some
text text
$ cat f4.bat $ cat f4.bat
$ cat bin $ cat bin
hello\x00\r (esc) hello\x00\r (esc)
$ cat f3 $ cat f3
some\r (esc) some\r (esc)
text\r (esc) text\r (esc)
$ cat f4.bat $ cat f4.bat
rem empty\r (esc) rem empty\r (esc)
$ $PYTHON -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")' $ $PYTHON -c 'open("f5.sh", "wb").write(b"# empty\x0D\x0A")'
$ hg add f5.sh $ hg add f5.sh
$ hg ci -m 7 $ hg ci -m 7
$ cat f5.sh $ cat f5.sh
# empty\r (esc) # empty\r (esc)
$ hg cat f5.sh $ hg cat f5.sh
# empty # empty
$ echo '% just linefeed' > linefeed $ echo '% just linefeed' > linefeed
$ hg ci -qAm 8 linefeed $ hg ci -qAm 8 linefeed