This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3635

py3: add support for NoneType in stringutil.pprint()
ClosedPublic

Authored by pulkit on May 20 2018, 9:39 AM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHG7aeb8aa262eb: py3: add support for NoneType in stringutil.pprint()

Summary

There are some places in codebase where we try to print the value None, however
'%s' % None is invalid on Python 3. So it will be good to have support in
stringutil.pprint()

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.May 20 2018, 9:39 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMay 20 2018, 9:39 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

pulkit added a child revision: D3636: py3: use pycompat.fsencode() to convert user value to bytes.May 20 2018, 9:39 AM

indygreg accepted this revision.May 21 2018, 2:30 PM

This revision is now accepted and ready to land.May 21 2018, 2:30 PM

Closed by commit rHG7aeb8aa262eb: py3: add support for NoneType in stringutil.pprint() (authored by pulkit). · Explain WhyMay 21 2018, 2:36 PM

This revision was automatically updated to reflect the committed changes.

a/mercurial/utils/stringutil.py

+++ b/mercurial/utils/stringutil.py
@@ -29,6 +29,8 @@
if bprefix:
    return "b'%s'" % escapestr(o)
return "'%s'" % escapestr(o)
+ elif o is None:
+ return 'None'

Should be handled by b'%r' % o.

a/mercurial/utils/stringutil.py

+++ b/mercurial/utils/stringutil.py
@@ -29,6 +29,8 @@
if bprefix:
    return "b'%s'" % escapestr(o)
return "'%s'" % escapestr(o)
+ elif o is None:
+ return 'None'
Should be handled by b'%r' % o.

Dropped this patch from hg-committed before sinking deep.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/utils/stringutil.py (2 lines)

Commit	Parents	Author	Summary	Date
		Pulkit Goyal		May 20 2018, 9:13 AM

Status	Author	Revision
Closed	pulkit	D3638 py3: add 3 new passing tests to whitelist
Closed	pulkit	D3637 py3: add b'' prefixes in tests/test-revset2.t
Abandoned	pulkit	D3636 py3: use pycompat.fsencode() to convert user value to bytes
Closed	pulkit	D3635 py3: add support for NoneType in stringutil.pprint()
Closed	pulkit	D3634 py3: add r'' prefixes to fix kwargs handling in hgext/sparse.py
Closed	pulkit	D3633 py3: use bytes in tests/printenv.py
Closed	pulkit	D3632 py3: use stringutil.pprint() to prevent b'' prefixes in output
Closed	pulkit	D3631 py3: use pycompat.fsencode to convert path to bytes
Closed	pulkit	D3630 py3: add b'' prefixes in tests/test-ssh.t and tests/test-ssh-bundle1.t
Closed	pulkit	D3629 py3: add b'' prefixes in contrib/hg-ssh

Diff 8843

mercurial/utils/stringutil.py

	)			)

	def pprint(o, bprefix=False):			def pprint(o, bprefix=False):
	"""Pretty print an object."""			"""Pretty print an object."""
	if isinstance(o, bytes):			if isinstance(o, bytes):
	if bprefix:			if bprefix:
	return "b'%s'" % escapestr(o)			return "b'%s'" % escapestr(o)
	return "'%s'" % escapestr(o)			return "'%s'" % escapestr(o)
				elif o is None:
				return 'None'
	elif isinstance(o, bytearray):			elif isinstance(o, bytearray):
	# codecs.escape_encode() can't handle bytearray, so escapestr fails			# codecs.escape_encode() can't handle bytearray, so escapestr fails
	# without coercion.			# without coercion.
	return "bytearray['%s']" % escapestr(bytes(o))			return "bytearray['%s']" % escapestr(bytes(o))
	elif isinstance(o, list):			elif isinstance(o, list):
	return '[%s]' % (b', '.join(pprint(a, bprefix=bprefix) for a in o))			return '[%s]' % (b', '.join(pprint(a, bprefix=bprefix) for a in o))
	elif isinstance(o, dict):			elif isinstance(o, dict):
	return '{%s}' % (b', '.join(			return '{%s}' % (b', '.join(

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8843		May 20 2018, 9:39 AM	★	★
Diff 2	8860	rHG7aeb8aa262eb4d5be1f50e8a0e47084b6944a4ad	May 20 2018, 9:13 AM	★	★