# HG changeset patch # User Matt Harbison # Date 1648606956 14400 # Node ID 225659936fff843a5275d24f54d81189a181fb9d # Parent bde2e4ef968a57749e53c6818e9fbccfccd5b474 util: restore the util.pickle symbol 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. Differential Revision: https://phab.mercurial-scm.org/D12419 diff -r bde2e4ef968a -r 225659936fff mercurial/util.py --- a/mercurial/util.py Tue Mar 29 14:27:45 2022 +0200 +++ b/mercurial/util.py Tue Mar 29 22:22:36 2022 -0400 @@ -25,6 +25,7 @@ import locale import mmap import os +import pickle # provides util.pickle symbol import re as remod import shutil import stat diff -r bde2e4ef968a -r 225659936fff tests/test-check-pyflakes.t --- a/tests/test-check-pyflakes.t Tue Mar 29 14:27:45 2022 +0200 +++ b/tests/test-check-pyflakes.t Tue Mar 29 22:22:36 2022 -0400 @@ -24,4 +24,5 @@ mercurial/util.py:*:* undefined name 'file' (glob) (?) mercurial/encoding.py:*:* undefined name 'localstr' (glob) (?) tests/run-tests.py:*:* undefined name 'PermissionError' (glob) (?) + mercurial/util.py:*:* 'pickle' imported but unused (glob)