Skip to content

bpo-33648: remove PY_WARN_ON_C_LOCALE #7114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 11, 2018
Merged

bpo-33648: remove PY_WARN_ON_C_LOCALE #7114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c96dc1d
bpo-33648: remove PY_WARN_ON_C_LOCALE
grimreaper May 25, 2018
5a7e059
regen
grimreaper May 25, 2018
54dd62d
Add news
grimreaper May 25, 2018
92d56fa
regen v2
grimreaper Jun 9, 2018
dec82f3
regen
grimreaper Jun 16, 2018
2c7bccd
Add myself
grimreaper Jun 28, 2018
0573e56
Revert aclocal.m4 changes
methane Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/ACKS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ David Abrahams
Marc Abramowitz
Eldar Abusalimov
Ron Adam
Eitan Adler
Anton Afanasyev
Ali Afshar
Nitika Agarwal
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Build/2018-05-25-13-05-51.bpo-33648.bJ4JZH.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The --with-c-locale-warning configuration flag has been removed. It has had
no effect for about a year.
27 changes: 0 additions & 27 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,6 @@ enable_ipv6
with_doc_strings
with_pymalloc
with_c_locale_coercion
with_c_locale_warning
with_valgrind
with_dtrace
with_libm
Expand Down Expand Up @@ -1523,9 +1522,6 @@ Optional Packages:
--with(out)-c-locale-coercion
disable/enable C locale coercion to a UTF-8 based
locale
--with(out)-c-locale-warning
disable/enable locale compatibility warning in the C
locale
--with-valgrind Enable Valgrind support
--with(out)-dtrace disable/enable DTrace support
--with-libm=STRING math library
Expand Down Expand Up @@ -11046,29 +11042,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_c_locale_coercion" >&5
$as_echo "$with_c_locale_coercion" >&6; }

# Check for --with-c-locale-warning
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-c-locale-warning" >&5
$as_echo_n "checking for --with-c-locale-warning... " >&6; }

# Check whether --with-c-locale-warning was given.
if test "${with_c_locale_warning+set}" = set; then :
withval=$with_c_locale_warning;
fi


if test -z "$with_c_locale_warning"
then
with_c_locale_warning="yes"
fi
if test "$with_c_locale_warning" != "no"
then

$as_echo "#define PY_WARN_ON_C_LOCALE 1" >>confdefs.h

fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_c_locale_warning" >&5
$as_echo "$with_c_locale_warning" >&6; }

# Check for Valgrind support
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-valgrind" >&5
$as_echo_n "checking for --with-valgrind... " >&6; }
Expand Down
17 changes: 0 additions & 17 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3319,23 +3319,6 @@ then
fi
AC_MSG_RESULT($with_c_locale_coercion)

# Check for --with-c-locale-warning
AC_MSG_CHECKING(for --with-c-locale-warning)
AC_ARG_WITH(c-locale-warning,
AS_HELP_STRING([--with(out)-c-locale-warning],
[disable/enable locale compatibility warning in the C locale]))

if test -z "$with_c_locale_warning"
then
with_c_locale_warning="yes"
fi
if test "$with_c_locale_warning" != "no"
then
AC_DEFINE(PY_WARN_ON_C_LOCALE, 1,
[Define to emit a locale compatibility warning in the C locale])
fi
AC_MSG_RESULT($with_c_locale_warning)

# Check for Valgrind support
AC_MSG_CHECKING([for --with-valgrind])
AC_ARG_WITH([valgrind],
Expand Down
3 changes: 0 additions & 3 deletions pyconfig.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,9 +1327,6 @@
/* Cipher suite string for PY_SSL_DEFAULT_CIPHERS=0 */
#undef PY_SSL_DEFAULT_CIPHER_STRING

/* Define to emit a locale compatibility warning in the C locale */
#undef PY_WARN_ON_C_LOCALE

/* Define if you want to build an interpreter with many run-time checks. */
#undef Py_DEBUG

Expand Down