[Python-checkins] cpython (merge 3.5 -> 3.6): Merge 3.5.
stefan.krah
python-checkins at python.org
Mon Jan 9 07:16:30 EST 2017
https://hg.python.org/cpython/rev/1b767f2ff2c0
changeset: 106065:1b767f2ff2c0
branch: 3.6
parent: 106062:3220ecda3148
parent: 106064:35334a4d41aa
user: Stefan Krah <skrah at bytereef.org>
date: Mon Jan 09 13:11:51 2017 +0100
summary:
Merge 3.5.
files:
Modules/_decimal/_decimal.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -1118,12 +1118,12 @@
PyObject *retval;
if (PyUnicode_Check(name)) {
- if (_PyUnicode_EqualToASCIIString(name, "traps")) {
+ if (PyUnicode_CompareWithASCIIString(name, "traps") == 0) {
retval = ((PyDecContextObject *)self)->traps;
Py_INCREF(retval);
return retval;
}
- if (_PyUnicode_EqualToASCIIString(name, "flags")) {
+ if (PyUnicode_CompareWithASCIIString(name, "flags") == 0) {
retval = ((PyDecContextObject *)self)->flags;
Py_INCREF(retval);
return retval;
@@ -1143,10 +1143,10 @@
}
if (PyUnicode_Check(name)) {
- if (_PyUnicode_EqualToASCIIString(name, "traps")) {
+ if (PyUnicode_CompareWithASCIIString(name, "traps") == 0) {
return context_settraps_dict(self, value);
}
- if (_PyUnicode_EqualToASCIIString(name, "flags")) {
+ if (PyUnicode_CompareWithASCIIString(name, "flags") == 0) {
return context_setstatus_dict(self, value);
}
}
@@ -2449,14 +2449,14 @@
tmp = PyTuple_GET_ITEM(dectuple, 2);
if (PyUnicode_Check(tmp)) {
/* special */
- if (_PyUnicode_EqualToASCIIString(tmp, "F")) {
+ if (PyUnicode_CompareWithASCIIString(tmp, "F") == 0) {
strcat(sign_special, "Inf");
is_infinite = 1;
}
- else if (_PyUnicode_EqualToASCIIString(tmp, "n")) {
+ else if (PyUnicode_CompareWithASCIIString(tmp, "n") == 0) {
strcat(sign_special, "NaN");
}
- else if (_PyUnicode_EqualToASCIIString(tmp, "N")) {
+ else if (PyUnicode_CompareWithASCIIString(tmp, "N") == 0) {
strcat(sign_special, "sNaN");
}
else {
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list