mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
remove __version__s dependent on subversion keyword expansion (closes #12221)
This commit is contained in:
Benjamin Peterson
parent
9e3e1c6e4e
commit
8c6f88efa2
|
|
@ -23,8 +23,6 @@
|
|||
|
||||
"""
|
||||
|
||||
__version__ = "$Revision$" # Code version
|
||||
|
||||
from types import FunctionType, BuiltinFunctionType
|
||||
from copyreg import dispatch_table
|
||||
from copyreg import _extension_registry, _inverted_registry, _extension_cache
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ class or function within a module or module in a package. If the
|
|||
__author__ = "Ka-Ping Yee <ping@lfw.org>"
|
||||
__date__ = "26 February 2001"
|
||||
|
||||
__version__ = "$Revision$"
|
||||
__credits__ = """Guido van Rossum, for an excellent programming language.
|
||||
Tommy Burnette, the original creator of manpy.
|
||||
Paul Prescod, for all his work on onlinehelp.
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@
|
|||
"""Read from and write to tar format archives.
|
||||
"""
|
||||
|
||||
__version__ = "$Revision$"
|
||||
|
||||
version = "0.9.0"
|
||||
__author__ = "Lars Gust\u00e4bel (lars@gustaebel.de)"
|
||||
__date__ = "$Date$"
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@
|
|||
tk.mainloop()
|
||||
"""
|
||||
|
||||
__version__ = "$Revision$"
|
||||
|
||||
import sys
|
||||
if sys.platform == "win32":
|
||||
# Attempt to configure Tcl/Tk without requiring PATH
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
"""Interface to the Expat non-validating XML parser."""
|
||||
__version__ = '$Revision$'
|
||||
|
||||
import sys
|
||||
|
||||
from pyexpat import *
|
||||
|
|
|
|||
|
|
@ -184,6 +184,10 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #12221: Remove __version__ attributes from pyexpat, pickle, tarfile,
|
||||
pydoc, tkinter, and xml.parsers.expat. This were useless version constants
|
||||
left over from the Mercurial transition
|
||||
|
||||
- Issue #12085: Fix an attribute error in subprocess.Popen destructor if the
|
||||
constructor has failed, e.g. because of an undeclared keyword argument. Patch
|
||||
written by Oleg Oshmyan.
|
||||
|
|
|
|||
|
|
@ -1662,7 +1662,6 @@ MODULE_INITFUNC(void)
|
|||
PyObject *errors_module;
|
||||
PyObject *modelmod_name;
|
||||
PyObject *model_module;
|
||||
PyObject *version;
|
||||
PyObject *sys_modules;
|
||||
PyObject *tmpnum, *tmpstr;
|
||||
PyObject *codes_dict;
|
||||
|
|
@ -1699,10 +1698,6 @@ MODULE_INITFUNC(void)
|
|||
Py_INCREF(&Xmlparsetype);
|
||||
PyModule_AddObject(m, "XMLParserType", (PyObject *) &Xmlparsetype);
|
||||
|
||||
version = PyUnicode_FromString(PY_VERSION);
|
||||
if (!version)
|
||||
return;
|
||||
PyModule_AddObject(m, "__version__", version);
|
||||
PyModule_AddStringConstant(m, "EXPAT_VERSION",
|
||||
(char *) XML_ExpatVersion());
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Generated by typeslots.py $Revision$ */
|
||||
/* Generated by typeslots.py */
|
||||
0,
|
||||
0,
|
||||
offsetof(PyHeapTypeObject, as_mapping.mp_ass_subscript),
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
import sys, re
|
||||
|
||||
print("/* Generated by typeslots.py $Revision$ */")
|
||||
print("/* Generated by typeslots.py */")
|
||||
res = {}
|
||||
for line in sys.stdin:
|
||||
m = re.match("#define Py_([a-z_]+) ([0-9]+)", line)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
"""
|
||||
|
||||
__author__ = "Steve Purcell (stephen_purcell@yahoo.com)"
|
||||
__version__ = "$Revision: 1.7 $"[11:-2]
|
||||
|
||||
import sys
|
||||
import traceback
|
||||
|
|
|
|||
128
configure
vendored
128
configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision.
|
||||
# From configure.in HGVERSION.
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.65 for python 3.3.
|
||||
#
|
||||
|
|
@ -638,10 +638,6 @@ INSTALL_SCRIPT
|
|||
INSTALL_PROGRAM
|
||||
HAS_PYTHON
|
||||
DISABLE_ASDLGEN
|
||||
HAS_HG
|
||||
HGBRANCH
|
||||
HGTAG
|
||||
HGVERSION
|
||||
ARFLAGS
|
||||
AR
|
||||
RANLIB
|
||||
|
|
@ -692,6 +688,10 @@ UNIVERSALSDK
|
|||
CONFIG_ARGS
|
||||
SOVERSION
|
||||
VERSION
|
||||
HAS_HG
|
||||
HGBRANCH
|
||||
HGTAG
|
||||
HGVERSION
|
||||
target_alias
|
||||
host_alias
|
||||
build_alias
|
||||
|
|
@ -2687,6 +2687,66 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test -e $srcdir/.hg/00changelog.i
|
||||
then
|
||||
# Extract the first word of "hg", so it can be a program name with args.
|
||||
set dummy hg; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if test "${ac_cv_prog_HAS_HG+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$HAS_HG"; then
|
||||
ac_cv_prog_HAS_HG="$HAS_HG" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_HAS_HG="found"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_prog_HAS_HG" && ac_cv_prog_HAS_HG="not-found"
|
||||
fi
|
||||
fi
|
||||
HAS_HG=$ac_cv_prog_HAS_HG
|
||||
if test -n "$HAS_HG"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_HG" >&5
|
||||
$as_echo "$HAS_HG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
else
|
||||
HAS_HG=no-repository
|
||||
fi
|
||||
if test $HAS_HG = found
|
||||
then
|
||||
HGVERSION="hg id -i \$(srcdir)"
|
||||
HGTAG="hg id -t \$(srcdir)"
|
||||
HGBRANCH="hg id -b \$(srcdir)"
|
||||
else
|
||||
HGVERSION=""
|
||||
HGTAG=""
|
||||
HGBRANCH=""
|
||||
fi
|
||||
|
||||
|
||||
|
||||
ac_config_headers="$ac_config_headers pyconfig.h"
|
||||
|
||||
|
||||
|
|
@ -5139,64 +5199,6 @@ then
|
|||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test -e $srcdir/.hg/00changelog.i
|
||||
then
|
||||
# Extract the first word of "hg", so it can be a program name with args.
|
||||
set dummy hg; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if test "${ac_cv_prog_HAS_HG+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$HAS_HG"; then
|
||||
ac_cv_prog_HAS_HG="$HAS_HG" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_HAS_HG="found"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_prog_HAS_HG" && ac_cv_prog_HAS_HG="not-found"
|
||||
fi
|
||||
fi
|
||||
HAS_HG=$ac_cv_prog_HAS_HG
|
||||
if test -n "$HAS_HG"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_HG" >&5
|
||||
$as_echo "$HAS_HG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
else
|
||||
HAS_HG=no-repository
|
||||
fi
|
||||
if test $HAS_HG = found
|
||||
then
|
||||
HGVERSION="hg id -i \$(srcdir)"
|
||||
HGTAG="hg id -t \$(srcdir)"
|
||||
HGBRANCH="hg id -b \$(srcdir)"
|
||||
else
|
||||
HGVERSION=""
|
||||
HGTAG=""
|
||||
HGBRANCH=""
|
||||
fi
|
||||
|
||||
|
||||
DISABLE_ASDLGEN=""
|
||||
# Extract the first word of "python", so it can be a program name with args.
|
||||
set dummy python; ac_word=$2
|
||||
|
|
|
|||
45
configure.in
45
configure.in
|
|
@ -7,8 +7,30 @@ m4_define(PYTHON_VERSION, 3.3)
|
|||
|
||||
AC_PREREQ(2.65)
|
||||
|
||||
AC_REVISION($Revision$)
|
||||
AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
|
||||
|
||||
AC_SUBST(HGVERSION)
|
||||
AC_SUBST(HGTAG)
|
||||
AC_SUBST(HGBRANCH)
|
||||
|
||||
if test -e $srcdir/.hg/00changelog.i
|
||||
then
|
||||
AC_CHECK_PROG(HAS_HG, hg, found, not-found)
|
||||
else
|
||||
HAS_HG=no-repository
|
||||
fi
|
||||
if test $HAS_HG = found
|
||||
then
|
||||
HGVERSION="hg id -i \$(srcdir)"
|
||||
HGTAG="hg id -t \$(srcdir)"
|
||||
HGBRANCH="hg id -b \$(srcdir)"
|
||||
else
|
||||
HGVERSION=""
|
||||
HGTAG=""
|
||||
HGBRANCH=""
|
||||
fi
|
||||
|
||||
AC_REVISION(HGVERSION)
|
||||
AC_CONFIG_SRCDIR([Include/object.h])
|
||||
AC_CONFIG_HEADER(pyconfig.h)
|
||||
|
||||
|
|
@ -808,27 +830,6 @@ then
|
|||
ARFLAGS="rc"
|
||||
fi
|
||||
|
||||
AC_SUBST(HGVERSION)
|
||||
AC_SUBST(HGTAG)
|
||||
AC_SUBST(HGBRANCH)
|
||||
|
||||
if test -e $srcdir/.hg/00changelog.i
|
||||
then
|
||||
AC_CHECK_PROG(HAS_HG, hg, found, not-found)
|
||||
else
|
||||
HAS_HG=no-repository
|
||||
fi
|
||||
if test $HAS_HG = found
|
||||
then
|
||||
HGVERSION="hg id -i \$(srcdir)"
|
||||
HGTAG="hg id -t \$(srcdir)"
|
||||
HGBRANCH="hg id -b \$(srcdir)"
|
||||
else
|
||||
HGVERSION=""
|
||||
HGTAG=""
|
||||
HGBRANCH=""
|
||||
fi
|
||||
|
||||
AC_SUBST(DISABLE_ASDLGEN)
|
||||
DISABLE_ASDLGEN=""
|
||||
AC_CHECK_PROG(HAS_PYTHON, python, found, not-found)
|
||||
|
|
|
|||
Loading…
Reference in a new issue