8000 bpo-33648: Remove PY_WARN_ON_C_LOCALE (GH-7114) · python/cpython@020f5ab · GitHub
[go: up one dir, main page]
Skip to content

Commit 020f5ab

Browse files
miss-islingtongrimreaper
miss-islington
and
grimreaper
authored
bpo-33648: Remove PY_WARN_ON_C_LOCALE (GH-7114)
This code does not appear to be used anywhere in the python code base. The use was removed in eb81795. (cherry picked from commit b91a3a0) Co-authored-by: Eitan Adler <grimreaper@users.noreply.github.com>
1 parent 0a1db32 commit 020f5ab

File tree

5 files changed

+3
-47
lines changed

5 files changed

+3
-47
lines changed

‎Misc/ACKS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ David Abrahams
1818
Marc Abramowitz
1919
Eldar Abusalimov
2020
Ron Adam
21+
Eitan Adler
2122
Anton Afanasyev
2223
Ali Afshar
2324
Nitika Agarwal

‎Misc/NEWS.d/next/Build/2018-05-25-13-05-51.bpo-33648.bJ4JZH.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The --with-c-locale-warning configuration flag has been removed. It has had
2+
no effect for about a year.

‎configure

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,6 @@ enable_ipv6
831831
with_doc_strings
832832
with_pymalloc
833833
with_c_locale_coercion
834-
with_c_locale_warning
835834
with_valgrind
836835
with_dtrace
837836
with_libm
@@ -1527,9 +1526,6 @@ Optional Packages:
15271526
--with(out)-c-locale-coercion
15281527
disable/enable C locale coercion to a UTF-8 based
15291528
locale
1530-
--with(out)-c-locale-warning
1531-
disable/enable locale compatibility warning in the C
1532-
locale
15331529
--with-valgrind Enable Valgrind support
15341530
--with(out)-dtrace disable/enable DTrace support
15351531
--with-libm=STRING math library
@@ -11128,29 +11124,6 @@ fi
1112811124
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_c_locale_coercion" >&5
1112911125
$as_echo "$with_c_locale_coercion" >&6; }
1113011126

11131-
# Check for --with-c-locale-warning
11132-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-c-locale-warning" >&5
11133-
$as_echo_n "checking for --with-c-locale-warning... " >&6; }
11134-
11135-
# Check whether --with-c-locale-warning was given.
11136-
if test "${with_c_locale_warning+set}" = set; then :
11137-
withval=$with_c_locale_warning;
11138-
fi
11139-
11140-
11141-
if test -z "$with_c_locale_warning"
11142-
then
11143-
with_c_locale_warning="yes"
11144-
fi
11145-
if test "$with_c_locale_warning" != "no"
11146-
then
11147-
11148-
$as_echo "#define PY_WARN_ON_C_LOCALE 1" >>confdefs.h
11149-
11150-
fi
11151-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_c_locale_warning" >&5
11152-
$as_echo " 10000 $with_c_locale_warning" >&6; }
11153-
1115411127
# Check for Valgrind support
1115511128
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-valgrind" >&5
1115611129
$as_echo_n "checking for --with-valgrind... " >&6; }

‎configure.ac

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3385,23 +3385,6 @@ then
33853385
fi
33863386
AC_MSG_RESULT($with_c_locale_coercion)
33873387

3388-
# Check for --with-c-locale-warning
3389-
AC_MSG_CHECKING(for --with-c-locale-warning)
3390-
AC_ARG_WITH(c-locale-warning,
3391-
AS_HELP_STRING([--with(out)-c-locale-warning],
3392-
[disable/enable locale compatibility warning in the C locale]))
3393-
3394-
if test -z "$with_c_locale_warning"
3395-
then
3396-
with_c_locale_warning="yes"
3397-
fi
3398-
if test "$with_c_locale_warning" != "no"
3399-
then
3400-
AC_DEFINE(PY_WARN_ON_C_LOCALE, 1,
3401-
[Define to emit a locale compatibility warning in the C locale])
3402-
fi
3403-
AC_MSG_RESULT($with_c_locale_warning)
3404-
34053388
# Check for Valgrind support
34063389
AC_MSG_CHECKING([for --with-valgrind])
34073390
AC_ARG_WITH([valgrind],

‎pyconfig.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,9 +1324,6 @@
13241324
/* Cipher suite string for PY_SSL_DEFAULT_CIPHERS=0 */
13251325
#undef PY_SSL_DEFAULT_CIPHER_STRING
13261326

1327-
/* Define to emit a locale compatibility warning in the C locale */
1328-
#undef PY_WARN_ON_C_LOCALE
1329-
13301327
/* Define if you want to build an interpreter with many run-time checks. */
13311328
#undef Py_DEBUG
13321329

0 commit comments

Comments
 (0)
0