Issue #24779: Remove unused rawmode parameter to unicode_decode.

ericvsmith · ericvsmith · commit 70065ea4eaab · 2015-09-21T13:36:09.000-04:00
diff --git a/Python/ast.c b/Python/ast.c
@@ -3938,7 +3938,7 @@ decode_utf8(struct compiling *c, const char **sPtr, const char *end)
 }
 
 static PyObject *
-decode_unicode(struct compiling *c, const char *s, size_t len, int rawmode, const char *encoding)
+decode_unicode(struct compiling *c, const char *s, size_t len, const char *encoding)
 {
     PyObject *v, *u;
     char *buf;
@@ -3994,10 +3994,7 @@ decode_unicode(struct compiling *c, const char *s, size_t len, int rawmode, cons
         len = p - buf;
         s = buf;
     }
-    if (rawmode)
-        v = PyUnicode_DecodeRawUnicodeEscape(s, len, NULL);
-    else
-        v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);
+    v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);
     Py_XDECREF(u);
     return v;
 }
@@ -4896,7 +4893,7 @@ parsestr(struct compiling *c, const node *n, int *bytesmode, int *fmode)
         }
     }
     if (!*bytesmode && !rawmode) {
-        return decode_unicode(c, s, len, rawmode, c->c_encoding);
+        return decode_unicode(c, s, len, c->c_encoding);
     }
     if (*bytesmode) {
         /* Disallow non-ascii characters (but not escapes) */

Original file line number	Diff line number	Diff line change
`@@ -3938,7 +3938,7 @@ decode_utf8(struct compiling c, const char sPtr, const char end)`
`3938`	`3938`	`}`
`3939`	`3939`
`3940`	`3940`	`static PyObject *`
`3941`		`-decode_unicode(struct compiling c, const char s, size_t len, int rawmode, const char *encoding)`
	`3941`	`+decode_unicode(struct compiling c, const char s, size_t len, const char *encoding)`
`3942`	`3942`	`{`
`3943`	`3943`	`PyObject v, u;`
`3944`	`3944`	`char *buf;`
`@@ -3994,10 +3994,7 @@ decode_unicode(struct compiling c, const char s, size_t len, int rawmode, cons`
`3994`	`3994`	`len = p - buf;`
`3995`	`3995`	`s = buf;`
`3996`	`3996`	`}`
`3997`		`- if (rawmode)`
`3998`		`- v = PyUnicode_DecodeRawUnicodeEscape(s, len, NULL);`
`3999`		`- else`
`4000`		`- v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);`
	`3997`	`+ v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);`
`4001`	`3998`	`Py_XDECREF(u);`
`4002`	`3999`	`return v;`
`4003`	`4000`	`}`
`@@ -4896,7 +4893,7 @@ parsestr(struct compiling c, const node n, int bytesmode, int fmode)`
`4896`	`4893`	`}`
`4897`	`4894`	`}`
`4898`	`4895`	`if (!*bytesmode && !rawmode) {`
`4899`		`- return decode_unicode(c, s, len, rawmode, c->c_encoding);`
	`4896`	`+ return decode_unicode(c, s, len, c->c_encoding);`
`4900`	`4897`	`}`
`4901`	`4898`	`if (*bytesmode) {`
`4902`	`4899`	`/* Disallow non-ascii characters (but not escapes) */`