[Python-checkins] CVS: python/dist/src/Python sysmodule.c,2.61,2.62

[Fred Drake]

Update of /projects/cvsroot/python/dist/src/Python
In directory seahag.cnri.reston.va.us:/home/fdrake/projects/python/Python

Modified Files:
	sysmodule.c 
Log Message:

Simplify creation of the version_info value for clarity, per
suggestion from Greg Stein.


Index: sysmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/sysmodule.c,v
retrieving revision 2.61
retrieving revision 2.62
diff -C2 -r2.61 -r2.62
*** sysmodule.c	2000/04/13 17:44:51	2.61
--- sysmodule.c	2000/04/13 20:03:20	2.62
***************
*** 384,387 ****
--- 384,388 ----
  	PyObject *m, *v, *sysdict;
  	PyObject *sysin, *sysout, *syserr;
+ 	char *s;
  
  	m = Py_InitModule3("sys", sys_methods, sys_doc);
***************
*** 414,432 ****
  	 */
  #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_ALPHA
! 	v = PyString_FromString("alpha");
  #endif
  #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_BETA
! 	v = PyString_FromString("beta");
  #endif
  #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_GAMMA
! 	v = PyString_FromString("candidate");
  #endif
  #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_FINAL
! 	v = PyString_FromString("final");
  #endif
  	PyDict_SetItemString(sysdict, "version_info",
! 			     v = Py_BuildValue("iiiNi", PY_MAJOR_VERSION,
  					       PY_MINOR_VERSION,
! 					       PY_MICRO_VERSION, v,
  					       PY_RELEASE_SERIAL));
  	Py_XDECREF(v);
--- 415,433 ----
  	 */
  #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_ALPHA
! 	s = "alpha";
  #endif
  #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_BETA
! 	s = "beta";
  #endif
  #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_GAMMA
! 	s = "candidate";
  #endif
  #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_FINAL
! 	s = "final";
  #endif
  	PyDict_SetItemString(sysdict, "version_info",
! 			     v = Py_BuildValue("iiisi", PY_MAJOR_VERSION,
  					       PY_MINOR_VERSION,
! 					       PY_MICRO_VERSION, s,
  					       PY_RELEASE_SERIAL));
  	Py_XDECREF(v);