Patchwork D12419: util: restore the util.pickle symbol

login
register
mail settings
Submitter phabricator
Date March 30, 2022, 5:46 a.m.
Message ID <differential-rev-PHID-DREV-fgi4kkhwa3xcaahhkttb-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50767/
State New
Headers show

Comments

phabricator - March 30, 2022, 5:46 a.m.
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This was accidently dropped in df56e6bd37f6 <https://phab.mercurial-scm.org/rHGdf56e6bd37f6638a415aee115ad5ad86e8eec423>, 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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12419

AFFECTED FILES
  mercurial/util.py
  tests/test-check-pyflakes.t

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-check-pyflakes.t b/tests/test-check-pyflakes.t
--- a/tests/test-check-pyflakes.t
+++ b/tests/test-check-pyflakes.t
@@ -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)
   
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -25,6 +25,7 @@ 
 import locale
 import mmap
 import os
+import pickle  # provides util.pickle symbol
 import re as remod
 import shutil
 import stat