Merged revisions 62246-62259 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62246 | georg.brandl | 2008-04-09 19:57:38 +0200 (Mi, 09 Apr 2008) | 2 lines

  #2585: initialize code attribute of HTTPError.
........
  r62247 | georg.brandl | 2008-04-09 19:58:56 +0200 (Mi, 09 Apr 2008) | 2 lines

  Add :issue: directive for easy linking to bugs.python.org.
........
  r62249 | gregory.p.smith | 2008-04-09 20:18:43 +0200 (Mi, 09 Apr 2008) | 2 lines

  Add a note about the zlib.decompressobj().flush() fix.
........
  r62255 | martin.v.loewis | 2008-04-09 20:56:20 +0200 (Mi, 09 Apr 2008) | 2 lines

  Package wininst*.exe from distutils/command.
........
  r62259 | andrew.kuchling | 2008-04-10 00:28:43 +0200 (Do, 10 Apr 2008) | 1 line

  Try out the new issue role.  Thanks, Georg!
........

diff --git a/Doc/conf.py b/Doc/conf.py
index b7fdf454ad06323f7dea8c7353131f7f708c4c28..ec889d70b7df20043767411a35a9fa2678c02396 100644 (file)
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -14,7 +14,7 @@ sys.path.append('tools/sphinxext')
 # ---------------------
 
 extensions = ['sphinx.ext.refcounting', 'sphinx.ext.coverage',
-              'sphinx.ext.doctest']
+              'sphinx.ext.doctest', 'pyspecific']
 templates_path = ['tools/sphinxext']
 
 # General substitutions.

diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
new file mode 100644 (file)
index 0000000..f7c0daa
--- /dev/null
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+"""
+    pyspecific.py
+    ~~~~~~~~~~~~~
+
+    Sphinx extension with Python doc-specific markup.
+
+    :copyright: 2008 by Georg Brandl.
+    :license: Python license.
+"""
+
+ISSUE_URI = 'http://bugs.python.org/issue%s'
+
+from docutils import nodes, utils
+
+def issue_role(typ, rawtext, text, lineno, inliner, options={}, content=[]):
+    issue = utils.unescape(text)
+    text = 'issue ' + issue
+    refnode = nodes.reference(text, text, refuri=ISSUE_URI % issue)
+    return [refnode], []
+
+
+def setup(app):
+    app.add_role('issue', issue_role)

diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 29a2693b55f5557e972d2c81eba6ff01966daef5..8cbe49fe491f9022480614dac159e04b6408e99f 100644 (file)
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -1217,7 +1217,7 @@ Here are all of the changes that Python 2.6 makes to the core Python language.
     >>> f(**ud)
     ['a', 'b']
 
-  .. Patch 1686487
+  (Contributed by Alexander Belopolsky; :issue:`1686487`.)
 
 * Tuples now have an :meth:`index` method matching the list type's
   :meth:`index` method::

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index b95d672398ebe3d789009f340c24ff51d16a5411..145882673ae13fbdb6191cc6e81fd34516bcc637 100644 (file)
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -157,7 +157,7 @@ class HTTPError(URLError, addinfourl):
         # file object.  If this happens, the simplest workaround is to
         # not initialize the base classes.
         if fp is not None:
-            self.__super_init(fp, hdrs, url)
+            self.__super_init(fp, hdrs, url, code)
 
     def __str__(self):
         return 'HTTP Error %s: %s' % (self.code, self.msg)

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 978e7f74c74901ca2699a0c1306d2682532751c6..d2774c85f410620a8256878d70855eea0dc9c912 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -969,10 +969,7 @@ def add_files(db):
             lib.glob("*.gif")
             lib.add_file("idle.icns")
         if dir=="command" and parent.physical=="distutils":
-            lib.add_file("wininst-6.0.exe")
-            lib.add_file("wininst-7.1.exe")
-            lib.add_file("wininst-8.0.exe")
-            lib.add_file("wininst-9.0.exe")
+            lib.glob("wininst*.exe")
         if dir=="setuptools":
             lib.add_file("cli.exe")
             lib.add_file("gui.exe")