This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3587

pathencode: fix importing hashlib on Python 3
ClosedPublic

Authored by durin42 on May 18 2018, 8:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG92ac9cf78dba: pathencode: fix importing hashlib on Python 3
Summary

I'm curious why PyImport_Import is returning NULL, but
PyImport_ImportModule bypasses some of the regular import path,
probably including demandimport, which I suspect is the issue here.

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

durin42 created this revision.May 18 2018, 8:51 PM
yuja added a subscriber: yuja.May 18 2018, 10:35 PM

Queued, thanks.

		if (name == NULL)
			return -1;
  • hashlib = PyImport_Import(name);

+ hashlib = PyImport_ImportModule("hashlib");

		Py_DECREF(name);

Nit: name is no longer used.

Closed by commit rHG92ac9cf78dba: pathencode: fix importing hashlib on Python 3 (authored by durin42). · Explain WhyMay 18 2018, 10:37 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/pathencode.c (2 lines)

Diff 8758

mercurial/cext/pathencode.c

PyObject *shaobj, *hashobj; PyObject *shaobj, *hashobj;
if (shafunc == NULL) { if (shafunc == NULL) {
PyObject *hashlib, *name = PyBytes_FromString("hashlib"); PyObject *hashlib, *name = PyBytes_FromString("hashlib");
if (name == NULL) if (name == NULL)
return -1; return -1;
hashlib = PyImport_Import(name); hashlib = PyImport_ImportModule("hashlib");
Py_DECREF(name); Py_DECREF(name);
if (hashlib == NULL) { if (hashlib == NULL) {
PyErr_SetString(PyExc_ImportError, "hashlib"); PyErr_SetString(PyExc_ImportError, "hashlib");
return -1; return -1;
} }
shafunc = PyObject_GetAttrString(hashlib, "sha1"); shafunc = PyObject_GetAttrString(hashlib, "sha1");
Py_DECREF(hashlib); Py_DECREF(hashlib);