Mercurial > public > mercurial-scm > hg-stable
diff mercurial/worker.py @ 48961:df56e6bd37f6
py3: use pickle directly
pycompat.pickle abstracted over the different pickle modules in
Python 2 and 3. Now that we're Python 3 only, it is safe to use the
`pickle` module directly. So this commit does that.
As part of this we remove the rules from check-code.py that were
forbidden direct pickle module use.
We retain the `util.pickle` symbol for backwards compatibility, just
in case some extensions were using it.
Differential Revision: https://phab.mercurial-scm.org/D12249
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Tue, 01 Mar 2022 20:29:03 -0800 |
| parents | d4ba4d51f85f |
| children | 6000f5b25c9b |
line wrap: on
line diff
--- a/mercurial/worker.py Wed Mar 02 17:51:27 2022 -0800 +++ b/mercurial/worker.py Tue Mar 01 20:29:03 2022 -0800 @@ -9,6 +9,7 @@ import errno import os +import pickle import signal import sys import threading @@ -27,7 +28,6 @@ error, pycompat, scmutil, - util, ) @@ -256,7 +256,7 @@ os.close(w) os.close(rfd) for result in func(*(staticargs + (pargs,))): - os.write(wfd, util.pickle.dumps(result)) + os.write(wfd, pickle.dumps(result)) return 0 ret = scmutil.callcatch(ui, workerfunc) @@ -292,7 +292,7 @@ while openpipes > 0: for key, events in selector.select(): try: - res = util.pickle.load(_blockingreader(key.fileobj)) + res = pickle.load(_blockingreader(key.fileobj)) if hasretval and res[0]: retval.update(res[1]) else: