diff options
| -rw-r--r-- | Doc/howto/advocacy.rst | 3 | ||||
| -rw-r--r-- | Doc/howto/cporting.rst | 4 | ||||
| -rw-r--r-- | Doc/howto/regex.rst | 4 | ||||
| -rw-r--r-- | Doc/library/markup.rst | 4 | ||||
| -rw-r--r-- | Lib/distutils/command/bdist_msi.py | 2 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_bdist_msi.py | 18 | ||||
| -rw-r--r-- | Lib/xmlrpc/server.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
8 files changed, 24 insertions, 15 deletions
diff --git a/Doc/howto/advocacy.rst b/Doc/howto/advocacy.rst index e67e201..2969d26 100644 --- a/Doc/howto/advocacy.rst +++ b/Doc/howto/advocacy.rst @@ -264,8 +264,7 @@ the organizations that use Python. **What are the restrictions on Python's use?** -They're practically nonexistent. Consult the :file:`Misc/COPYRIGHT` file in the -source distribution, or the section :ref:`history-and-license` for the full +They're practically nonexistent. Consult :ref:`history-and-license` for the full language, but it boils down to three conditions: * You have to leave the copyright notice on the software; if you don't include diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst index 98db9dd..bea2153 100644 --- a/Doc/howto/cporting.rst +++ b/Doc/howto/cporting.rst @@ -261,8 +261,8 @@ behave slightly differently from real Capsules. Specifically: copy as you see fit.) You can find :file:`capsulethunk.h` in the Python source distribution -in the :file:`Doc/includes` directory. We also include it here for -your reference; here is :file:`capsulethunk.h`: +as :source:`Doc/includes/capsulethunk.h`. We also include it here for +your convenience: .. literalinclude:: ../includes/capsulethunk.h diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst index 07a8b56..3ac03ca 100644 --- a/Doc/howto/regex.rst +++ b/Doc/howto/regex.rst @@ -360,7 +360,7 @@ and more. You can learn about this by interactively experimenting with the :mod:`re` module. If you have :mod:`tkinter` available, you may also want to look at -:file:`Tools/demo/redemo.py`, a demonstration program included with the +:source:`Tools/demo/redemo.py`, a demonstration program included with the Python distribution. It allows you to enter REs and strings, and displays whether the RE matches or fails. :file:`redemo.py` can be quite useful when trying to debug a complicated RE. Phil Schwartz's `Kodos @@ -495,7 +495,7 @@ more convenient. If a program contains a lot of regular expressions, or re-uses the same ones in several locations, then it might be worthwhile to collect all the definitions in one place, in a section of code that compiles all the REs ahead of time. To take an example from the standard library, here's an extract -from the now deprecated :file:`xmllib.py`:: +from the now-defunct Python 2 standard :mod:`xmllib` module:: ref = re.compile( ... ) entityref = re.compile( ... ) diff --git a/Doc/library/markup.rst b/Doc/library/markup.rst index 49794ef..1b4cca5 100644 --- a/Doc/library/markup.rst +++ b/Doc/library/markup.rst @@ -23,7 +23,7 @@ definition of the Python bindings for the DOM and SAX interfaces. html.rst html.parser.rst html.entities.rst - pyexpat.rst + xml.etree.elementtree.rst xml.dom.rst xml.dom.minidom.rst xml.dom.pulldom.rst @@ -31,4 +31,4 @@ definition of the Python bindings for the DOM and SAX interfaces. xml.sax.handler.rst xml.sax.utils.rst xml.sax.reader.rst - xml.etree.elementtree.rst + pyexpat.rst diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py index b3cfe9c..fde0f63 100644 --- a/Lib/distutils/command/bdist_msi.py +++ b/Lib/distutils/command/bdist_msi.py @@ -260,7 +260,7 @@ class bdist_msi(Command): self.db.Commit() if hasattr(self.distribution, 'dist_files'): - tup = 'bdist_msi', self.target_version or 'any', fullname + tup = 'bdist_msi', self.target_version or 'any', installer_name self.distribution.dist_files.append(tup) if not self.keep_temp: diff --git a/Lib/distutils/tests/test_bdist_msi.py b/Lib/distutils/tests/test_bdist_msi.py index 9308c79..9cbfb0c 100644 --- a/Lib/distutils/tests/test_bdist_msi.py +++ b/Lib/distutils/tests/test_bdist_msi.py @@ -1,12 +1,11 @@ """Tests for distutils.command.bdist_msi.""" -import unittest import sys - +import unittest from test.support import run_unittest - from distutils.tests import support -@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32") + +@unittest.skipUnless(sys.platform == 'win32', 'these tests require Windows') class BDistMSITestCase(support.TempdirManager, support.LoggingSilencer, unittest.TestCase): @@ -14,9 +13,18 @@ class BDistMSITestCase(support.TempdirManager, def test_minimal(self): # minimal test XXX need more tests from distutils.command.bdist_msi import bdist_msi - pkg_pth, dist = self.create_dist() + project_dir, dist = self.create_dist() cmd = bdist_msi(dist) cmd.ensure_finalized() + cmd.run() + + bdists = os.listdir(os.path.join(project_dir, 'dist')) + self.assertEqual(bdists, ['foo-0.1.msi']) + + # bug #13719: upload ignores bdist_msi files + self.assertEqual(dist.dist_files, + [('bdist_msi', 'any', 'dist/foo-0.1.msi')]) + def test_suite(): return unittest.makeSuite(BDistMSITestCase) diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py index fc3fa4b..54e1726 100644 --- a/Lib/xmlrpc/server.py +++ b/Lib/xmlrpc/server.py @@ -1,4 +1,4 @@ -"""XML-RPC Servers. +r"""XML-RPC Servers. This module can be used to create simple XML-RPC servers by creating a server and either installing functions, a @@ -13,6 +13,8 @@ Core and Builtins Library ------- +- Issue #13719: Make the distutils upload command aware of bdist_msi products. + - Issue #14007: Accept incomplete TreeBuilder objects (missing start, end, data or close method) for the Python implementation as well. Drop the no-op TreeBuilder().xml() method from the C implementation. |