[Python-checkins] r73607 - in python/branches/py3k: Tools/msi/msi.py
martin.v.loewis
python-checkins at python.org
Sun Jun 28 14:28:30 CEST 2009
Author: martin.v.loewis
Date: Sun Jun 28 14:28:29 2009
New Revision: 73607
Log:
Merged revisions 73606 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73606 | martin.v.loewis | 2009-06-28 14:24:23 +0200 (So, 28 Jun 2009) | 2 lines
Fix types in logic to compute help file name.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Tools/msi/msi.py
Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py (original)
+++ python/branches/py3k/Tools/msi/msi.py Sun Jun 28 14:28:29 2009
@@ -117,13 +117,13 @@
# Compute the name that Sphinx gives to the docfile
docfile = ""
-if micro:
- docfile = str(micro)
+if int(micro):
+ docfile = micro
if level < 0xf:
if level == 0xC:
- docfile = "rc%s" % (serial,)
+ docfile += "rc%s" % (serial,)
else:
- docfile = '%x%s' % (level, serial)
+ docfile += '%x%s' % (level, serial)
docfile = 'python%s%s%s.chm' % (major, minor, docfile)
# Build the mingw import library, libpythonXY.a
More information about the Python-checkins
mailing list