chore: fix pylint-2.7 errors (#33233)
This commit is contained in:
parent
fdb60240f3
commit
45e2f86fe0
13 changed files with 30 additions and 32 deletions
|
@ -233,8 +233,8 @@ def to_utf8(patch):
|
|||
"""Python 2/3 compatibility: unicode has been renamed to str in Python3"""
|
||||
if sys.version_info[0] >= 3:
|
||||
return str(patch, "utf-8")
|
||||
else:
|
||||
return unicode(patch, "utf-8")
|
||||
|
||||
return unicode(patch, "utf-8")
|
||||
|
||||
|
||||
def export_patches(repo, out_dir, patch_range=None, dry_run=False):
|
||||
|
@ -268,7 +268,7 @@ def export_patches(repo, out_dir, patch_range=None, dry_run=False):
|
|||
out_dir, len(bad_patches), "\n-- ".join(bad_patches)
|
||||
)
|
||||
)
|
||||
exit(1)
|
||||
sys.exit(1)
|
||||
else:
|
||||
# Remove old patches so that deleted commits are correctly reflected in the
|
||||
# patch files (as a removed file)
|
||||
|
@ -291,4 +291,3 @@ def export_patches(repo, out_dir, patch_range=None, dry_run=False):
|
|||
) as f:
|
||||
f.write(formatted_patch.encode('utf-8'))
|
||||
pl.write(filename + '\n')
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue