This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3125

py3: convert user value to bytes by b'' prefix
ClosedPublic

Authored by pulkit on Apr 5 2018, 8:31 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGcb70be32f5f7: py3: convert user value to bytes by b'' prefix
Summary

This makes test-journal* pass on Python 3.5.

  1. skip-blame beacuse just b'' prefix

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.Apr 5 2018, 8:31 AM
yuja requested changes to this revision.Apr 5 2018, 9:45 AM
yuja added a subscriber: yuja.

Unicode issue is handled by posix.py. The problem is mockgetuser()
returns a unicode string.

This revision now requires changes to proceed.Apr 5 2018, 9:45 AM
pulkit added a comment.Apr 5 2018, 3:23 PM
In D3125#50284, @yuja wrote:

Unicode issue is handled by posix.py. The problem is mockgetuser()
returns a unicode string.

Thanks, I overlooked that and was unable to find what can cause trouble so just added an extra fsencode() call.

pulkit edited the summary of this revision. (Show Details)Apr 5 2018, 3:26 PM
pulkit retitled this revision from py3: convert user value to bytes using pycompat.fsencode() to py3: convert user value to bytes by b'' prefix.
pulkit updated this revision to Diff 7751.
Closed by commit rHGcb70be32f5f7: py3: convert user value to bytes by b'' prefix (authored by pulkit). · Explain WhyApr 6 2018, 8:41 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-journal-share.t (2 lines)
Mtests/test-journal.t (2 lines)

Diff 7773

tests/test-journal-share.t

Journal extension test: tests the share extension support Journal extension test: tests the share extension support
$ cat >> testmocks.py << EOF $ cat >> testmocks.py << EOF
> # mock out procutil.getuser() and util.makedate() to supply testable values > # mock out procutil.getuser() and util.makedate() to supply testable values
> import os > import os
> from mercurial import util > from mercurial import util
> from mercurial.utils import procutil > from mercurial.utils import procutil
> def mockgetuser(): > def mockgetuser():
> return 'foobar' > return b'foobar'
> >
> def mockmakedate(): > def mockmakedate():
> filename = os.path.join(os.environ['TESTTMP'], 'testtime') > filename = os.path.join(os.environ['TESTTMP'], 'testtime')
> try: > try:
> with open(filename, 'rb') as timef: > with open(filename, 'rb') as timef:
> time = float(timef.read()) + 1 > time = float(timef.read()) + 1
> except IOError: > except IOError:
> time = 0.0 > time = 0.0

tests/test-journal.t

Tests for the journal extension; records bookmark locations. Tests for the journal extension; records bookmark locations.
$ cat >> testmocks.py << EOF $ cat >> testmocks.py << EOF
> # mock out procutil.getuser() and util.makedate() to supply testable values > # mock out procutil.getuser() and util.makedate() to supply testable values
> import os > import os
> from mercurial import util, pycompat > from mercurial import util, pycompat
> from mercurial.utils import dateutil, procutil > from mercurial.utils import dateutil, procutil
> def mockgetuser(): > def mockgetuser():
> return 'foobar' > return b'foobar'
> >
> def mockmakedate(): > def mockmakedate():
> filename = os.path.join(os.environ['TESTTMP'], 'testtime') > filename = os.path.join(os.environ['TESTTMP'], 'testtime')
> try: > try:
> with open(filename, 'rb') as timef: > with open(filename, 'rb') as timef:
> time = float(timef.read()) + 1 > time = float(timef.read()) + 1
> except IOError: > except IOError:
> time = 0.0 > time = 0.0