From a01bd62f481336c1a874eebd3e93143aa17cf3c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 28 Jun 2009 12:29:40 +0000 Subject: [PATCH] Merged revisions 73607 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r73607 | martin.v.loewis | 2009-06-28 14:28:29 +0200 (So, 28 Jun 2009) | 9 lines 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. ........ ................ --- Tools/msi/msi.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index d6a2048eac7..cd67e996c07 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -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