[PATCH 3 of 5] pathencode: use hashlib.sha1 directly instead of indirecting through util
Augie Fackler
raf at durin42.com
Fri Jun 10 00:41:16 EDT 2016
# HG changeset patch
# User Augie Fackler <raf at durin42.com>
# Date 1465532707 14400
# Fri Jun 10 00:25:07 2016 -0400
# Node ID 08f06fc43974db42a5b5ba45744c584a2832ff3a
# Parent bd2caf6762219aba40edd4dd697fee70de306940
pathencode: use hashlib.sha1 directly instead of indirecting through util
diff --git a/mercurial/pathencode.c b/mercurial/pathencode.c
--- a/mercurial/pathencode.c
+++ b/mercurial/pathencode.c
@@ -653,24 +653,24 @@ static int sha1hash(char hash[20], const
PyObject *shaobj, *hashobj;
if (shafunc == NULL) {
- PyObject *util, *name = PyString_FromString("mercurial.util");
+ PyObject *hashlib, *name = PyString_FromString("hashlib");
if (name == NULL)
return -1;
- util = PyImport_Import(name);
+ hashlib = PyImport_Import(name);
Py_DECREF(name);
- if (util == NULL) {
- PyErr_SetString(PyExc_ImportError, "mercurial.util");
+ if (hashlib == NULL) {
+ PyErr_SetString(PyExc_ImportError, "hashlib");
return -1;
}
- shafunc = PyObject_GetAttrString(util, "sha1");
- Py_DECREF(util);
+ shafunc = PyObject_GetAttrString(hashlib, "sha1");
+ Py_DECREF(hashlib);
if (shafunc == NULL) {
PyErr_SetString(PyExc_AttributeError,
- "module 'mercurial.util' has no "
+ "module 'hashlib' has no "
"attribute 'sha1'");
return -1;
}
More information about the Mercurial-devel
mailing list