[Python-3000-checkins] r62265 - in python/branches/py3k: Doc/conf.py Doc/tools/sphinxext/pyspecific.py Doc/whatsnew/2.6.rst Lib/urllib2.py Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Apr 10 05:06:53 2008
New Revision: 62265

Added:
   python/branches/py3k/Doc/tools/sphinxext/pyspecific.py
      - copied unchanged from r62259, python/trunk/Doc/tools/sphinxext/pyspecific.py
Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/conf.py
   python/branches/py3k/Doc/whatsnew/2.6.rst
   python/branches/py3k/Lib/urllib2.py
   python/branches/py3k/Tools/msi/msi.py
Log:
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!
........


Modified: python/branches/py3k/Doc/conf.py
==============================================================================
--- python/branches/py3k/Doc/conf.py	(original)
+++ python/branches/py3k/Doc/conf.py	Thu Apr 10 05:06:53 2008
@@ -14,7 +14,7 @@
 # ---------------------
 
 extensions = ['sphinx.ext.refcounting', 'sphinx.ext.coverage',
-              'sphinx.ext.doctest']
+              'sphinx.ext.doctest', 'pyspecific']
 templates_path = ['tools/sphinxext']
 
 # General substitutions.

Modified: python/branches/py3k/Doc/whatsnew/2.6.rst
==============================================================================
--- python/branches/py3k/Doc/whatsnew/2.6.rst	(original)
+++ python/branches/py3k/Doc/whatsnew/2.6.rst	Thu Apr 10 05:06:53 2008
@@ -1217,7 +1217,7 @@
     >>> 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::

Modified: python/branches/py3k/Lib/urllib2.py
==============================================================================
--- python/branches/py3k/Lib/urllib2.py	(original)
+++ python/branches/py3k/Lib/urllib2.py	Thu Apr 10 05:06:53 2008
@@ -157,7 +157,7 @@
         # 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)

Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py	(original)
+++ python/branches/py3k/Tools/msi/msi.py	Thu Apr 10 05:06:53 2008
@@ -969,10 +969,7 @@
             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")