Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit80ac853

Browse files
committed
python.m4: Remove useless "import string" calls
They have been unneeded since the use of the string module has beenremoved ina65ed83.
1 parent04e5cb6 commit80ac853

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎config/python.m4‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fi
3232
AC_MSG_CHECKING([Python configuration directory])
3333
python_majorversion=`${PYTHON} -c "import sys; print(sys.version[[0]])"`
3434
python_version=`${PYTHON} -c "import sys; print(sys.version[[:3]])"`
35-
python_configdir=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"`
35+
python_configdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"`
3636
python_includespec=`${PYTHON} -c "import distutils.sysconfig; print('-I'+distutils.sysconfig.get_python_inc())"`
3737
3838
AC_SUBST(python_majorversion)[]dnl
@@ -56,9 +56,9 @@ AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP],
5656
[AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
5757
AC_MSG_CHECKING([how to link an embedded Python application])
5858
59-
python_libdir=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBDIR'))))"`
60-
python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"`
61-
python_so=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('SO'))))"`
59+
python_libdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBDIR'))))"`
60+
python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"`
61+
python_so=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('SO'))))"`
6262
ldlibrary=`echo "${python_ldlibrary}" | sed "s/${python_so}$//"`
6363
6464
if test x"${python_libdir}" != x"" -a x"${python_ldlibrary}" != x"" -a x"${python_ldlibrary}" != x"${ldlibrary}"
@@ -70,14 +70,14 @@ else
7070
# Old way: use libpython from python_configdir
7171
python_libdir="${python_configdir}"
7272
# LDVERSION was introduced in Python 3.2.
73-
python_ldversion=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
73+
python_ldversion=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
7474
if test x"${python_ldversion}" = x""; then
7575
python_ldversion=$python_version
7676
fi
7777
python_libspec="-L${python_libdir} -lpython${python_ldversion}"
7878
fi
7979
80-
python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
80+
python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
8181
8282
AC_MSG_RESULT([${python_libspec} ${python_additional_libs}])
8383

‎configure‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7302,7 +7302,7 @@ fi
73027302
$as_echo_n "checking Python configuration directory... " >&6; }
73037303
python_majorversion=`${PYTHON} -c "import sys; print(sys.version[0])"`
73047304
python_version=`${PYTHON} -c "import sys; print(sys.version[:3])"`
7305-
python_configdir=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"`
7305+
python_configdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"`
73067306
python_includespec=`${PYTHON} -c "import distutils.sysconfig; print('-I'+distutils.sysconfig.get_python_inc())"`
73077307

73087308
# This should be enough of a message.
@@ -7313,9 +7313,9 @@ $as_echo "$python_configdir" >&6; }
73137313
{ $as_echo "$as_me:$LINENO: checking how to link an embedded Python application" >&5
73147314
$as_echo_n "checking how to link an embedded Python application... " >&6; }
73157315

7316-
python_libdir=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBDIR'))))"`
7317-
python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"`
7318-
python_so=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('SO'))))"`
7316+
python_libdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBDIR'))))"`
7317+
python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"`
7318+
python_so=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('SO'))))"`
73197319
ldlibrary=`echo "${python_ldlibrary}" | sed "s/${python_so}$//"`
73207320

73217321
if test x"${python_libdir}" != x"" -a x"${python_ldlibrary}" != x"" -a x"${python_ldlibrary}" != x"${ldlibrary}"
@@ -7327,14 +7327,14 @@ else
73277327
# Old way: use libpython from python_configdir
73287328
python_libdir="${python_configdir}"
73297329
# LDVERSION was introduced in Python 3.2.
7330-
python_ldversion=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
7330+
python_ldversion=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
73317331
if test x"${python_ldversion}" = x""; then
73327332
python_ldversion=$python_version
73337333
fi
73347334
python_libspec="-L${python_libdir} -lpython${python_ldversion}"
73357335
fi
73367336

7337-
python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
7337+
python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
73387338

73397339
{ $as_echo "$as_me:$LINENO: result: ${python_libspec} ${python_additional_libs}" >&5
73407340
$as_echo "${python_libspec} ${python_additional_libs}" >&6; }

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp