This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12419

util: restore the util.pickle symbol
ClosedPublic

Authored by mharbison72 on Mar 30 2022, 1:45 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG225659936fff: util: restore the util.pickle symbol
Summary

This was accidently dropped in df56e6bd37f6, which started importing pickle
directly. That commit explicitly says it will retain it for compatibility with
external stuff though.

The unused import in pycompat isn't flagged because that module is skipped.
Just importing with a comment seemed cleaner than import X as Y and then
assigning to a pickle variable, just to avoid the pyflakes warning.

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

mharbison72 created this revision.Mar 30 2022, 1:45 AM
mharbison72 added inline comments.Mar 30 2022, 1:49 AM
mercurial/util.py
28

Alternately, we can skip the next patch and just restore pickle = pycompat.pickle. But since there were check-code rules pointing toward util.pickle, I initially thought to cleanup pycompat a bit. That is at odds with the end of the series, which keeps several unused imports in pycompat.

marmoute accepted this revision.Mar 31 2022, 5:33 PM
mharbison72 added a commit: rHG225659936fff: util: restore the util.pickle symbol.Apr 1 2022, 3:40 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG225659936fff: util: restore the util.pickle symbol (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (1 line)
Mtests/test-check-pyflakes.t (1 line)

Diff 32742

mercurial/util.py

import errno import errno
import gc import gc
import hashlib import hashlib
import io import io
import itertools import itertools
import locale import locale
import mmap import mmap
import os import os
import pickle # provides util.pickle symbol
mharbison72AuthorUnsubmitted
Done

Alternately, we can skip the next patch and just restore pickle = pycompat.pickle. But since there were check-code rules pointing toward util.pickle, I initially thought to cleanup pycompat a bit. That is at odds with the end of the series, which keeps several unused imports in pycompat.

mharbison72: Alternately, we can skip the next patch and just restore `pickle = pycompat.pickle`. But since…
import re as remod import re as remod
import shutil import shutil
import stat import stat
import sys import sys
import time import time
import traceback import traceback
import warnings import warnings

tests/test-check-pyflakes.t

> -X mercurial/thirdparty \ > -X mercurial/thirdparty \
> 2>/dev/null \ > 2>/dev/null \
> | xargs "$PYTHON" -m pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py" > | xargs "$PYTHON" -m pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py"
contrib/perf.py:*:* undefined name 'xrange' (glob) (?) contrib/perf.py:*:* undefined name 'xrange' (glob) (?)
mercurial/hgweb/server.py:*:* undefined name 'reload' (glob) (?) mercurial/hgweb/server.py:*:* undefined name 'reload' (glob) (?)
mercurial/util.py:*:* undefined name 'file' (glob) (?) mercurial/util.py:*:* undefined name 'file' (glob) (?)
mercurial/encoding.py:*:* undefined name 'localstr' (glob) (?) mercurial/encoding.py:*:* undefined name 'localstr' (glob) (?)
tests/run-tests.py:*:* undefined name 'PermissionError' (glob) (?) tests/run-tests.py:*:* undefined name 'PermissionError' (glob) (?)
mercurial/util.py:*:* 'pickle' imported but unused (glob)