Merge 3.6.

Stefan Krah · Stefan Krah · commit a40a3f35ebd1 · 2017-01-09T13:12:09.000+01:00
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -1118,12 +1118,12 @@ context_getattr(PyObject self, PyObject name)`
`1118`	`1118`	`PyObject *retval;`
`1119`	`1119`
`1120`	`1120`	`if (PyUnicode_Check(name)) {`
`1121`		`- if (_PyUnicode_EqualToASCIIString(name, "traps")) {`
	`1121`	`+ if (PyUnicode_CompareWithASCIIString(name, "traps") == 0) {`
`1122`	`1122`	`retval = ((PyDecContextObject *)self)->traps;`
`1123`	`1123`	`Py_INCREF(retval);`
`1124`	`1124`	`return retval;`
`1125`	`1125`	`}`
`1126`		`- if (_PyUnicode_EqualToASCIIString(name, "flags")) {`
	`1126`	`+ if (PyUnicode_CompareWithASCIIString(name, "flags") == 0) {`
`1127`	`1127`	`retval = ((PyDecContextObject *)self)->flags;`
`1128`	`1128`	`Py_INCREF(retval);`
`1129`	`1129`	`return retval;`
`@@ -1143,10 +1143,10 @@ context_setattr(PyObject self, PyObject name, PyObject *value)`
`1143`	`1143`	`}`
`1144`	`1144`
`1145`	`1145`	`if (PyUnicode_Check(name)) {`
`1146`		`- if (_PyUnicode_EqualToASCIIString(name, "traps")) {`
	`1146`	`+ if (PyUnicode_CompareWithASCIIString(name, "traps") == 0) {`
`1147`	`1147`	`return context_settraps_dict(self, value);`
`1148`	`1148`	`}`
`1149`		`- if (_PyUnicode_EqualToASCIIString(name, "flags")) {`
	`1149`	`+ if (PyUnicode_CompareWithASCIIString(name, "flags") == 0) {`
`1150`	`1150`	`return context_setstatus_dict(self, value);`
`1151`	`1151`	`}`
`1152`	`1152`	`}`
`@@ -2449,14 +2449,14 @@ dectuple_as_str(PyObject *dectuple)`
`2449`	`2449`	`tmp = PyTuple_GET_ITEM(dectuple, 2);`
`2450`	`2450`	`if (PyUnicode_Check(tmp)) {`
`2451`	`2451`	`/* special */`
`2452`		`- if (_PyUnicode_EqualToASCIIString(tmp, "F")) {`
	`2452`	`+ if (PyUnicode_CompareWithASCIIString(tmp, "F") == 0) {`
`2453`	`2453`	`strcat(sign_special, "Inf");`
`2454`	`2454`	`is_infinite = 1;`
`2455`	`2455`	`}`
`2456`		`- else if (_PyUnicode_EqualToASCIIString(tmp, "n")) {`
	`2456`	`+ else if (PyUnicode_CompareWithASCIIString(tmp, "n") == 0) {`
`2457`	`2457`	`strcat(sign_special, "NaN");`
`2458`	`2458`	`}`
`2459`		`- else if (_PyUnicode_EqualToASCIIString(tmp, "N")) {`
	`2459`	`+ else if (PyUnicode_CompareWithASCIIString(tmp, "N") == 0) {`
`2460`	`2460`	`strcat(sign_special, "sNaN");`
`2461`	`2461`	`}`
`2462`	`2462`	`else {`