summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2017-01-09 12:11:51 (GMT)
committerStefan Krah <skrah@bytereef.org>2017-01-09 12:11:51 (GMT)
commite660335b7e168bb5e25a5813fefdff71737d63fa (patch)
tree87c594c50d8ffc8412dc57676c4c957644fb5a53 /Modules
parenta0be562daf096c240133c99937bc78626069c5b8 (diff)
parent18e0a97a1a3b1cbe38f65611ca846055247f56f8 (diff)
downloadcpython-e660335b7e168bb5e25a5813fefdff71737d63fa.zip
cpython-e660335b7e168bb5e25a5813fefdff71737d63fa.tar.gz
cpython-e660335b7e168bb5e25a5813fefdff71737d63fa.tar.bz2
Merge 3.5.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_decimal/_decimal.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
index 9956786..fcc1f15 100644
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -1118,12 +1118,12 @@ context_getattr(PyObject *self, PyObject *name)
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 @@ context_setattr(PyObject *self, PyObject *name, PyObject *value)
}
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 @@ dectuple_as_str(PyObject *dectuple)
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 {