Remove "#ifdef Py_UNICODE_WIDE": Python is now always wide

Victor Stinner · Victor Stinner · commit 63ab875cfefc · 2011-11-22T03:31:20.000+01:00
diff --git a/Modules/_sre.c b/Modules/_sre.c
@@ -500,7 +500,7 @@ SRE_COUNT(SRE_STATE* state, SRE_CODE* pattern, Py_ssize_t maxcount)
     case SRE_OP_IN:
         /* repeated set */
         TRACE(("|%p|%p|COUNT IN\n", pattern, ptr));
-        while (ptr < end && 
+        while (ptr < end &&
                SRE_CHARSET(pattern + 2, SRE_CHARGET(state, ptr, 0)))
             ptr += state->charsize;
         break;
@@ -1030,7 +1030,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern)
                 ctx->u.chr = ctx->pattern[ctx->pattern[0]+1];
                 for (;;) {
                     while (ctx->count >= (Py_ssize_t) ctx->pattern[1] &&
-                           (ctx->ptr >= end || 
+                           (ctx->ptr >= end ||
                             SRE_CHARGET(state, ctx->ptr, 0) != ctx->u.chr)) {
                         ctx->ptr -= state->charsize;
                         ctx->count--;
@@ -1302,7 +1302,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern)
                     if (!p || !e || e < p)
                         RETURN_FAILURE;
                     while (p < e) {
-                        if (ctx->ptr >= end || 
+                        if (ctx->ptr >= end ||
                             SRE_CHARGET(state, ctx->ptr, 0) != SRE_CHARGET(state, p, 0))
                             RETURN_FAILURE;
                         p += state->charsize;
@@ -2664,7 +2664,7 @@ _compile(PyObject* self_, PyObject* args)
     if (pattern == Py_None) {
         self->logical_charsize = -1;
         self->charsize = -1;
-    } 
+    }
     else {
         Py_ssize_t p_length;
         if (!getstring(pattern, &p_length, &self->logical_charsize,
@@ -3021,10 +3021,8 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, Py_ssize_t groups)
                 GET_ARG; max = arg;
                 if (min > max)
                     FAIL;
-#ifdef Py_UNICODE_WIDE
                 if (max > 65535)
                     FAIL;
-#endif
                 if (!_validate_inner(code, code+skip-4, groups))
                     FAIL;
                 code += skip-4;
@@ -3042,10 +3040,8 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, Py_ssize_t groups)
                 GET_ARG; max = arg;
                 if (min > max)
                     FAIL;
-#ifdef Py_UNICODE_WIDE
                 if (max > 65535)
                     FAIL;
-#endif
                 if (!_validate_inner(code, code+skip-3, groups))
                     FAIL;
                 code += skip-3;
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -518,17 +518,10 @@ builtin_chr(PyObject *self, PyObject *args)
     return PyUnicode_FromOrdinal(x);
 }
 
-PyDoc_VAR(chr_doc) = PyDoc_STR(
+PyDoc_STRVAR(chr_doc,
 "chr(i) -> Unicode character\n\
 \n\
-Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff."
-)
-#ifndef Py_UNICODE_WIDE
-PyDoc_STR(
-"\nIf 0x10000 <= i, a surrogate pair is returned."
-)
-#endif
-;
+Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff.");
 
 
 static char *
diff --git a/Python/traceback.c b/Python/traceback.c
@@ -526,23 +526,17 @@ dump_ascii(int fd, PyObject *text)
             char c = (char)ch;
             write(fd, &c, 1);
         }
-        else if (ch < 256) {
+        else if (ch < 0xff) {
             PUTS(fd, "\\x");
             dump_hexadecimal(2, ch, fd);
         }
-        else
-#ifdef Py_UNICODE_WIDE
-        if (ch < 65536)
-#endif
-        {
+        else if (ch < 0xffff) {
             PUTS(fd, "\\u");
             dump_hexadecimal(4, ch, fd);
-#ifdef Py_UNICODE_WIDE
         }
         else {
             PUTS(fd, "\\U");
             dump_hexadecimal(8, ch, fd);
-#endif
         }
     }
     if (truncated)

Original file line number	Diff line number	Diff line change
`@@ -526,23 +526,17 @@ dump_ascii(int fd, PyObject *text)`
`526`	`526`	`char c = (char)ch;`
`527`	`527`	`write(fd, &c, 1);`
`528`	`528`	`}`
`529`		`- else if (ch < 256) {`
	`529`	`+ else if (ch < 0xff) {`
`530`	`530`	`PUTS(fd, "\\x");`
`531`	`531`	`dump_hexadecimal(2, ch, fd);`
`532`	`532`	`}`
`533`		`- else`
`534`		`-#ifdef Py_UNICODE_WIDE`
`535`		`- if (ch < 65536)`
`536`		`-#endif`
`537`		`- {`
	`533`	`+ else if (ch < 0xffff) {`
`538`	`534`	`PUTS(fd, "\\u");`
`539`	`535`	`dump_hexadecimal(4, ch, fd);`
`540`		`-#ifdef Py_UNICODE_WIDE`
`541`	`536`	`}`
`542`	`537`	`else {`
`543`	`538`	`PUTS(fd, "\\U");`
`544`	`539`	`dump_hexadecimal(8, ch, fd);`
`545`		`-#endif`
`546`	`540`	`}`
`547`	`541`	`}`
`548`	`542`	`if (truncated)`