Merge sphinx changes

Doc/tools/sphinxext/patchlevel.py

@@ -34,8 +34,7 @@ def get_header_version_info(srcdir):
 
     release = version = '%s.%s' % (d['PY_MAJOR_VERSION'], d['PY_MINOR_VERSION'])
     micro = int(d['PY_MICRO_VERSION'])
-    if micro != 0:
-        release += '.' + str(micro)
+    release += '.' + str(micro)
 
     level = d['PY_RELEASE_LEVEL']
     suffixes = {
@@ -51,8 +50,7 @@ def get_header_version_info(srcdir):
 def get_sys_version_info():
     major, minor, micro, level, serial = sys.version_info
     release = version = '%s.%s' % (major, minor)
-    if micro:
-        release += '.%s' % micro
+    release += '.%s' % micro
     if level != 'final':
         release += '%s%s' % (level[0], serial)
     return version, release

Lib/idlelib/EditorWindow.py

@@ -28,8 +28,7 @@ def _sphinx_version():
     "Format sys.version_info to produce the Sphinx version string used to install the chm docs"
     major, minor, micro, level, serial = sys.version_info
     release = '%s%s' % (major, minor)
-    if micro:
-        release += '%s' % (micro,)
+    release += '%s' % (micro,)
     if level == 'candidate':
         release += 'rc%s' % (serial,)
     elif level != 'final':

Tools/msi/msi.py

@@ -122,9 +122,7 @@ pythondll_uuid = {
     } [major+minor]
 
 # Compute the name that Sphinx gives to the docfile
-docfile = ""
-if int(micro):
-    docfile = micro
+docfile = micro
 if level < 0xf:
     if level == 0xC:
         docfile += "rc%s" % (serial,)