Skip to content

Commit 2a38a86

Browse files
warsawwarsaw
committed
Expose Subversion revision number (calculated via "svnversion .") to Python.
Add C API function Py_GetBuildNumber(), add it to the interactive prompt banner (i.e. Py_GetBuildInfo()), and add it as the sys.build_number attribute. The build number is a string instead of an int because it may contain a trailing 'M' if there are local modifications.
1 parent 11ca77e commit 2a38a86

File tree

7 files changed

+32
-4
lines changed

7 files changed

+32
-4
lines changed

‎Doc/api/init.tex‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,12 @@ \chapter{Initialization, Finalization, and Threads
272272
\withsubitem{(in module sys)}{\ttindex{version}}
273273
\end{cfuncdesc}
274274

275+
\begin{cfuncdesc}{const char*}{Py_GetBuildNumber}{}
276+
Return a string representing the Subversion revision that this Python
277+
executable was built from. This number is a string because it may contain a
278+
trailing 'M' if Python was built from a mixed revision source tree.
279+
\end{cfuncdesc}
280+
275281
\begin{cfuncdesc}{const char*}{Py_GetPlatform}{}
276282
Return the platform identifier for the current platform. On \UNIX,
277283
this is formed from the ``official'' name of the operating system,

‎Doc/lib/libsys.tex‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ \section{\module{sys} ---
2727
\versionadded{2.0}
2828
\end{datadesc}
2929

30+
\begin{datadesc}{build_number}
31+
A string representing the Subversion revision that this Python executable
32+
was built from. This number is a string because it may contain a trailing
33+
'M' if Python was built from a mixed revision source tree.
34+
\end{datadesc}
35+
3036
\begin{datadesc}{builtin_module_names}
3137
A tuple of strings giving the names of all modules that are compiled
3238
into this Python interpreter. (This information is not available in

‎Include/pythonrun.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ PyAPI_FUNC(const char *) Py_GetPlatform(void);
108108
PyAPI_FUNC(const char *) Py_GetCopyright(void);
109109
PyAPI_FUNC(const char *) Py_GetCompiler(void);
110110
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
111+
PyAPI_FUNC(const char *) Py_GetBuildNumber(void);
111112

112113
/* Internal -- various one-time initializations */
113114
PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);

‎Makefile.pre.in‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,9 @@ buildno: $(PARSER_OBJS) \
349349
$(SIGNAL_OBJS) \
350350
$(MODOBJS) \
351351
$(srcdir)/Modules/getbuildinfo.c
352-
if test -f buildno; then \
352+
if test -d .svn; then \
353+
svnversion . >buildno; \
354+
elif test -f buildno; then \
353355
expr `cat buildno` + 1 >buildno1; \
354356
mv -f buildno1 buildno; \
355357
else echo 1 >buildno; fi
@@ -444,7 +446,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist
444446
# Special rules for object files
445447

446448
Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno
447-
$(CC) -c $(PY_CFLAGS) -DBUILD=`cat buildno` -o $@ $(srcdir)/Modules/getbuildinfo.c
449+
$(CC) -c $(PY_CFLAGS) -DBUILD=\"`cat buildno`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
448450

449451
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
450452
$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \

‎Misc/NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ What's New in Python 2.5 alpha 1?
1212
Core and builtins
1313
-----------------
1414

15+
- Patch #1382163: Expose Subversion revision number to Python. New C API
16+
function Py_GetBuildNumber(). New attribute sys.build_number. Build number
17+
is now displayed in interactive prompt banner.
18+
1519
- Implementation of PEP 341 - Unification of try/except and try/finally.
1620
"except" clauses can now be written together with a "finally" clause in
1721
one try statement instead of two nested ones. Patch #1355913.

‎Modules/getbuildinfo.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,20 @@
2121
#endif
2222

2323
#ifndef BUILD
24-
#define BUILD 0
24+
#define BUILD "0"
2525
#endif
2626

2727
const char *
2828
Py_GetBuildInfo(void)
2929
{
3030
static char buildinfo[50];
3131
PyOS_snprintf(buildinfo, sizeof(buildinfo),
32-
"#%d, %.20s, %.9s", BUILD, DATE, TIME);
32+
"%s, %.20s, %.9s", BUILD, DATE, TIME);
3333
return buildinfo;
3434
}
35+
36+
const char *
37+
Py_GetBuildNumber(void)
38+
{
39+
return BUILD;
40+
}

‎Python/sysmodule.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,6 +1003,9 @@ _PySys_Init(void)
10031003
PyDict_SetItemString(sysdict, "hexversion",
10041004
v = PyInt_FromLong(PY_VERSION_HEX));
10051005
Py_XDECREF(v);
1006+
PyDict_SetItemString(sysdict, "build_number",
1007+
v = PyString_FromString(Py_GetBuildNumber()));
1008+
Py_XDECREF(v);
10061009
/*
10071010
* These release level checks are mutually exclusive and cover
10081011
* the field, so don't get too fancy with the pre-processor!

0 commit comments

Comments
 (0)