This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2458

py3: use bytes instead of str in isinstance
ClosedPublic

Authored by pulkit on Feb 26 2018, 7:32 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG745b0df08514: py3: use bytes instead of str in isinstance
Summary

Internally we use bytes everywhere, and str on Python 3 is unicodes, so we need
to make sure we are doing the right check.

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 26 2018, 7:32 AM
Closed by commit rHG745b0df08514: py3: use bytes instead of str in isinstance (authored by pulkit). · Explain WhyFeb 26 2018, 8:13 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/archival.py (2 lines)

Diff 6126

mercurial/archival.py

def tidyprefix(dest, kind, prefix): def tidyprefix(dest, kind, prefix):
'''choose prefix to use for names in archive. make sure prefix is '''choose prefix to use for names in archive. make sure prefix is
safe for consumers.''' safe for consumers.'''
if prefix: if prefix:
prefix = util.normpath(prefix) prefix = util.normpath(prefix)
else: else:
if not isinstance(dest, str): if not isinstance(dest, bytes):
raise ValueError('dest must be string if no prefix') raise ValueError('dest must be string if no prefix')
prefix = os.path.basename(dest) prefix = os.path.basename(dest)
lower = prefix.lower() lower = prefix.lower()
for sfx in exts.get(kind, []): for sfx in exts.get(kind, []):
if lower.endswith(sfx): if lower.endswith(sfx):
prefix = prefix[:-len(sfx)] prefix = prefix[:-len(sfx)]
break break
lpfx = os.path.normpath(util.localpath(prefix)) lpfx = os.path.normpath(util.localpath(prefix))