[Python-checkins] cpython (merge 2.7 -> 2.7): Branch merge
eric.araujo
python-checkins at python.org
Sun Dec 9 04:46:10 CET 2012
http://hg.python.org/cpython/rev/80f0c7d5deda
changeset: 80767:80f0c7d5deda
branch: 2.7
parent: 80762:7e771f0363e2
parent: 80766:2383114ad7bd
user: Éric Araujo <aeric at mtlpy.org>
date: Sat Dec 08 22:45:09 2012 -0500
summary:
Branch merge
files:
Doc/distutils/apiref.rst | 3 +
Lib/distutils/command/check.py | 3 +
Lib/distutils/config.py | 5 --
Lib/distutils/tests/test_register.py | 33 ++++++++++-----
Misc/ACKS | 2 +
Misc/NEWS | 3 +
6 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -991,6 +991,9 @@
these files is available in answer D2 of the `NFS FAQ page
<http://nfs.sourceforge.net/#section_d>`_.
+ .. versionchanged:: 2.7.4
+ NFS files are ignored.
+
.. function:: remove_tree(directory[, verbose=0, dry_run=0])
diff --git a/Lib/distutils/command/check.py b/Lib/distutils/command/check.py
--- a/Lib/distutils/command/check.py
+++ b/Lib/distutils/command/check.py
@@ -26,6 +26,9 @@
def system_message(self, level, message, *children, **kwargs):
self.messages.append((level, message, children, kwargs))
+ return nodes.system_message(message, level=level,
+ type=self.levels[level],
+ *children, **kwargs)
HAS_DOCUTILS = True
except ImportError:
diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py
--- a/Lib/distutils/config.py
+++ b/Lib/distutils/config.py
@@ -47,11 +47,6 @@
f.write(DEFAULT_PYPIRC % (username, password))
finally:
f.close()
- try:
- os.chmod(rc, 0600)
- except OSError:
- # should do something better here
- pass
def _read_pypirc(self):
"""Reads the .pypirc file."""
diff --git a/Lib/distutils/tests/test_register.py b/Lib/distutils/tests/test_register.py
--- a/Lib/distutils/tests/test_register.py
+++ b/Lib/distutils/tests/test_register.py
@@ -1,6 +1,5 @@
# -*- encoding: utf8 -*-
"""Tests for distutils.command.register."""
-import sys
import os
import unittest
import getpass
@@ -11,11 +10,14 @@
from distutils.command import register as register_module
from distutils.command.register import register
-from distutils.core import Distribution
from distutils.errors import DistutilsSetupError
-from distutils.tests import support
-from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+from distutils.tests.test_config import PyPIRCCommandTestCase
+
+try:
+ import docutils
+except ImportError:
+ docutils = None
PYPIRC_NOPASSWORD = """\
[distutils]
@@ -192,6 +194,7 @@
self.assertEqual(headers['Content-length'], '290')
self.assertTrue('tarek' in req.data)
+ @unittest.skipUnless(docutils is not None, 'needs docutils')
def test_strict(self):
# testing the script option
# when on, the register command stops if
@@ -204,13 +207,6 @@
cmd.strict = 1
self.assertRaises(DistutilsSetupError, cmd.run)
- # we don't test the reSt feature if docutils
- # is not installed
- try:
- import docutils
- except ImportError:
- return
-
# metadata are OK but long_description is broken
metadata = {'url': 'xxx', 'author': 'xxx',
'author_email': u'éxéxé',
@@ -264,6 +260,21 @@
finally:
del register_module.raw_input
+ @unittest.skipUnless(docutils is not None, 'needs docutils')
+ def test_register_invalid_long_description(self):
+ description = ':funkie:`str`' # mimic Sphinx-specific markup
+ metadata = {'url': 'xxx', 'author': 'xxx',
+ 'author_email': 'xxx',
+ 'name': 'xxx', 'version': 'xxx',
+ 'long_description': description}
+ cmd = self._get_cmd(metadata)
+ cmd.ensure_finalized()
+ cmd.strict = True
+ inputs = RawInputs('2', 'tarek', 'tarek at ziade.org')
+ register_module.raw_input = inputs
+ self.addCleanup(delattr, register_module, 'raw_input')
+ self.assertRaises(DistutilsSetupError, cmd.run)
+
def test_check_metadata_deprecated(self):
# makes sure make_metadata is deprecated
cmd = self._get_cmd()
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -201,6 +201,7 @@
Scott Cotton
Greg Couch
David Cournapeau
+Julien Courteau
Steve Cousins
Alex Coventry
Matthew Dixon Cowles
@@ -572,6 +573,7 @@
Thomas Lee
Christopher Lee
Luc Lefebvre
+Pierre Paul Lefebvre
Glyph Lefkowitz
Vincent Legoll
Kip Lehman
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -162,6 +162,9 @@
- Issue #16628: Fix a memory leak in ctypes.resize().
+- Issue #13614: Fix setup.py register failure with invalid rst in description.
+ Patch by Julien Courteau and Pierre Paul Lefebvre.
+
- Issue #10182: The re module doesn't truncate indices to 32 bits anymore.
Patch by Serhiy Storchaka.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list