Mailman 3 October 2014 - Python-checkins

cpython (3.4): Issue #22759: Query methods on pathlib.Path() (exists(), is_dir(), etc.) now
by antoine.pitrou Oct. 30, 2014

Oct. 30, 2014

https://hg.python.org/cpython/rev/40497cc445f4 changeset: 93289:40497cc445f4 branch: 3.4 parent: 93287:77e5487c4de1 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Oct 30 23:14:03 2014 +0100 summary: Issue #22759: Query methods on pathlib.Path() (exists(), is_dir(), etc.) now return False when the underlying stat call raises NotADirectoryError. files: Lib/pathlib.py | 18 +++++++++--------- Lib/test/test_pathlib.py | 10 ++++++++++ Misc/NEWS | 3 +++ 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Lib/pathlib.py b/Lib/pathlib.py --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -8,7 +8,7 @@ import sys from collections import Sequence from contextlib import contextmanager -from errno import EINVAL, ENOENT +from errno import EINVAL, ENOENT, ENOTDIR from operator import attrgetter from stat import S_ISDIR, S_ISLNK, S_ISREG, S_ISSOCK, S_ISBLK, S_ISCHR, S_ISFIFO from urllib.parse import quote_from_bytes as urlquote_from_bytes @@ -1187,7 +1187,7 @@ try: self.stat() except OSError as e: - if e.errno != ENOENT: + if e.errno not in (ENOENT, ENOTDIR): raise return False return True @@ -1199,7 +1199,7 @@ try: return S_ISDIR(self.stat().st_mode) except OSError as e: - if e.errno != ENOENT: + if e.errno not in (ENOENT, ENOTDIR): raise # Path doesn't exist or is a broken symlink # (see https://bitbucket.org/pitrou/pathlib/issue/12/) @@ -1213,7 +1213,7 @@ try: return S_ISREG(self.stat().st_mode) except OSError as e: - if e.errno != ENOENT: + if e.errno not in (ENOENT, ENOTDIR): raise # Path doesn't exist or is a broken symlink # (see https://bitbucket.org/pitrou/pathlib/issue/12/) @@ -1226,7 +1226,7 @@ try: return S_ISLNK(self.lstat().st_mode) except OSError as e: - if e.errno != ENOENT: + if e.errno not in (ENOENT, ENOTDIR): raise # Path doesn't exist return False @@ -1238,7 +1238,7 @@ try: return S_ISBLK(self.stat().st_mode) except OSError as e: - if e.errno != ENOENT: + if e.errno not in (ENOENT, ENOTDIR): raise # Path doesn't exist or is a broken symlink # (see https://bitbucket.org/pitrou/pathlib/issue/12/) @@ -1251,7 +1251,7 @@ try: return S_ISCHR(self.stat().st_mode) except OSError as e: - if e.errno != ENOENT: + if e.errno not in (ENOENT, ENOTDIR): raise # Path doesn't exist or is a broken symlink # (see https://bitbucket.org/pitrou/pathlib/issue/12/) @@ -1264,7 +1264,7 @@ try: return S_ISFIFO(self.stat().st_mode) except OSError as e: - if e.errno != ENOENT: + if e.errno not in (ENOENT, ENOTDIR): raise # Path doesn't exist or is a broken symlink # (see https://bitbucket.org/pitrou/pathlib/issue/12/) @@ -1277,7 +1277,7 @@ try: return S_ISSOCK(self.stat().st_mode) except OSError as e: - if e.errno != ENOENT: + if e.errno not in (ENOENT, ENOTDIR): raise # Path doesn't exist or is a broken symlink # (see https://bitbucket.org/pitrou/pathlib/issue/12/) diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -1276,9 +1276,12 @@ self.assertIs(True, p.exists()) self.assertIs(True, (p / 'dirA').exists()) self.assertIs(True, (p / 'fileA').exists()) + self.assertIs(False, (p / 'fileA' / 'bah').exists()) if not symlink_skip_reason: self.assertIs(True, (p / 'linkA').exists()) self.assertIs(True, (p / 'linkB').exists()) + self.assertIs(True, (p / 'linkB' / 'fileB').exists()) + self.assertIs(False, (p / 'linkA' / 'bah').exists()) self.assertIs(False, (p / 'foo').exists()) self.assertIs(False, P('/xyzzy').exists()) @@ -1626,6 +1629,7 @@ self.assertTrue((P / 'dirA').is_dir()) self.assertFalse((P / 'fileA').is_dir()) self.assertFalse((P / 'non-existing').is_dir()) + self.assertFalse((P / 'fileA' / 'bah').is_dir()) if not symlink_skip_reason: self.assertFalse((P / 'linkA').is_dir()) self.assertTrue((P / 'linkB').is_dir()) @@ -1636,6 +1640,7 @@ self.assertTrue((P / 'fileA').is_file()) self.assertFalse((P / 'dirA').is_file()) self.assertFalse((P / 'non-existing').is_file()) + self.assertFalse((P / 'fileA' / 'bah').is_file()) if not symlink_skip_reason: self.assertTrue((P / 'linkA').is_file()) self.assertFalse((P / 'linkB').is_file()) @@ -1646,6 +1651,7 @@ self.assertFalse((P / 'fileA').is_symlink()) self.assertFalse((P / 'dirA').is_symlink()) self.assertFalse((P / 'non-existing').is_symlink()) + self.assertFalse((P / 'fileA' / 'bah').is_symlink()) if not symlink_skip_reason: self.assertTrue((P / 'linkA').is_symlink()) self.assertTrue((P / 'linkB').is_symlink()) @@ -1656,6 +1662,7 @@ self.assertFalse((P / 'fileA').is_fifo()) self.assertFalse((P / 'dirA').is_fifo()) self.assertFalse((P / 'non-existing').is_fifo()) + self.assertFalse((P / 'fileA' / 'bah').is_fifo()) @unittest.skipUnless(hasattr(os, "mkfifo"), "os.mkfifo() required") def test_is_fifo_true(self): @@ -1670,6 +1677,7 @@ self.assertFalse((P / 'fileA').is_socket()) self.assertFalse((P / 'dirA').is_socket()) self.assertFalse((P / 'non-existing').is_socket()) + self.assertFalse((P / 'fileA' / 'bah').is_socket()) @unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required") def test_is_socket_true(self): @@ -1690,12 +1698,14 @@ self.assertFalse((P / 'fileA').is_block_device()) self.assertFalse((P / 'dirA').is_block_device()) self.assertFalse((P / 'non-existing').is_block_device()) + self.assertFalse((P / 'fileA' / 'bah').is_block_device()) def test_is_char_device_false(self): P = self.cls(BASE) self.assertFalse((P / 'fileA').is_char_device()) self.assertFalse((P / 'dirA').is_char_device()) self.assertFalse((P / 'non-existing').is_char_device()) + self.assertFalse((P / 'fileA' / 'bah').is_char_device()) def test_is_char_device_true(self): # Under Unix, /dev/null should generally be a char device diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -33,6 +33,9 @@ Library ------- +- Issue #22759: Query methods on pathlib.Path() (exists(), is_dir(), etc.) + now return False when the underlying stat call raises NotADirectoryError. + - Issue #8876: distutils now falls back to copying files when hard linking doesn't work. This allows use with special filesystems such as VirtualBox shared folders. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Sphinx extension: move imports to the module top
by georg.brandl Oct. 30, 2014

Oct. 30, 2014

https://hg.python.org/cpython/rev/77e5487c4de1 changeset: 93287:77e5487c4de1 branch: 3.4 parent: 93285:100e8eae0b2b user: Georg Brandl <georg(a)python.org> date: Thu Oct 30 22:55:13 2014 +0100 summary: Sphinx extension: move imports to the module top files: Doc/tools/extensions/pyspecific.py | 61 +++++++++-------- 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py --- a/Doc/tools/extensions/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py @@ -9,15 +9,32 @@ :license: Python license. """ -ISSUE_URI = 'https://bugs.python.org/issue%s' -SOURCE_URI = 'https://hg.python.org/cpython/file/3.4/%s' +import re +import codecs +from os import path +from time import asctime +from pprint import pformat +from docutils.io import StringOutput +from docutils.utils import new_document from docutils import nodes, utils +from sphinx import addnodes +from sphinx.builders import Builder from sphinx.util.nodes import split_explicit_title from sphinx.util.compat import Directive from sphinx.writers.html import HTMLTranslator +from sphinx.writers.text import TextWriter from sphinx.writers.latex import LaTeXTranslator +from sphinx.domains.python import PyModulelevel, PyClassmember + +# Support for checking for suspicious markup + +import suspicious + + +ISSUE_URI = 'https://bugs.python.org/issue%s' +SOURCE_URI = 'https://hg.python.org/cpython/file/3.4/%s' # monkey-patch reST parser to disable alphabetic and roman enumerated lists from docutils.parsers.rst.states import Body @@ -29,6 +46,9 @@ # monkey-patch HTML and LaTeX translators to keep doctest blocks in the # doctest docs themselves orig_visit_literal_block = HTMLTranslator.visit_literal_block +orig_depart_literal_block = LaTeXTranslator.depart_literal_block + + def new_visit_literal_block(self, node): meta = self.builder.env.metadata[self.builder.current_docname] old_trim_doctest_flags = self.highlighter.trim_doctest_flags @@ -39,9 +59,7 @@ finally: self.highlighter.trim_doctest_flags = old_trim_doctest_flags -HTMLTranslator.visit_literal_block = new_visit_literal_block -orig_depart_literal_block = LaTeXTranslator.depart_literal_block def new_depart_literal_block(self, node): meta = self.builder.env.metadata[self.curfilestack[-1]] old_trim_doctest_flags = self.highlighter.trim_doctest_flags @@ -52,8 +70,11 @@ finally: self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +HTMLTranslator.visit_literal_block = new_visit_literal_block LaTeXTranslator.depart_literal_block = new_depart_literal_block + # Support for marking up and linking to bugs.python.org issues def issue_role(typ, rawtext, text, lineno, inliner, options={}, content=[]): @@ -101,9 +122,6 @@ # Support for documenting decorators -from sphinx import addnodes -from sphinx.domains.python import PyModulelevel, PyClassmember - class PyDecoratorMixin(object): def handle_signature(self, sig, signode): ret = super(PyDecoratorMixin, self).handle_signature(sig, signode) @@ -113,12 +131,14 @@ def needs_arglist(self): return False + class PyDecoratorFunction(PyDecoratorMixin, PyModulelevel): def run(self): # a decorator function is a function after all self.name = 'py:function' return PyModulelevel.run(self) + class PyDecoratorMethod(PyDecoratorMixin, PyClassmember): def run(self): self.name = 'py:method' @@ -162,7 +182,8 @@ classes=['versionmodified'])) else: para = nodes.paragraph('', '', - nodes.inline('', '%s.' % text, classes=['versionmodified'])) + nodes.inline('', '%s.' % text, + classes=['versionmodified'])) if len(node): node.insert(0, para) else: @@ -174,12 +195,10 @@ # Support for including Misc/NEWS -import re -import codecs - issue_re = re.compile('([Ii])ssue #([0-9]+)') whatsnew_re = re.compile(r"(?im)^what's new in (.*?)\??$") + class MiscNews(Directive): has_content = False required_arguments = 1 @@ -233,15 +252,6 @@ 'typesseq', 'typesseq-mutable', 'unary', 'while', 'with', 'yield' ] -from os import path -from time import asctime -from pprint import pformat -from docutils.io import StringOutput -from docutils.utils import new_document - -from sphinx.builders import Builder -from sphinx.writers.text import TextWriter - class PydocTopicsBuilder(Builder): name = 'pydoc-topics' @@ -281,16 +291,10 @@ f.close() -# Support for checking for suspicious markup - -import suspicious - - # Support for documenting Opcodes -import re +opcode_sig_re = re.compile(r'(\w+(?:\+\d)?)(?:\s*$(.*)$)?') -opcode_sig_re = re.compile(r'(\w+(?:\+\d)?)(?:\s*$(.*)$)?') def parse_opcode_signature(env, sig, signode): """Transform an opcode signature into RST nodes.""" @@ -311,12 +315,13 @@ pdbcmd_sig_re = re.compile(r'([a-z()!]+)\s*(.*)') # later... -#pdbargs_tokens_re = re.compile(r'''[a-zA-Z]+ | # identifiers +# pdbargs_tokens_re = re.compile(r'''[a-zA-Z]+ | # identifiers # [.,:]+ | # punctuation # [\[\]()] | # parens # \s+ # whitespace # ''', re.X) + def parse_pdb_command(env, sig, signode): """Transform a pdb command signature into RST nodes.""" m = pdbcmd_sig_re.match(sig) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge with 3.4
by georg.brandl Oct. 30, 2014

Oct. 30, 2014

https://hg.python.org/cpython/rev/41404b0cca9e changeset: 93288:41404b0cca9e parent: 93286:fad22f068c7c parent: 93287:77e5487c4de1 user: Georg Brandl <georg(a)python.org> date: Thu Oct 30 22:56:04 2014 +0100 summary: merge with 3.4 files: Doc/tools/extensions/pyspecific.py | 61 +++++++++-------- 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py --- a/Doc/tools/extensions/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py @@ -9,15 +9,32 @@ :license: Python license. """ -ISSUE_URI = 'https://bugs.python.org/issue%s' -SOURCE_URI = 'https://hg.python.org/cpython/file/default/%s' +import re +import codecs +from os import path +from time import asctime +from pprint import pformat +from docutils.io import StringOutput +from docutils.utils import new_document from docutils import nodes, utils +from sphinx import addnodes +from sphinx.builders import Builder from sphinx.util.nodes import split_explicit_title from sphinx.util.compat import Directive from sphinx.writers.html import HTMLTranslator +from sphinx.writers.text import TextWriter from sphinx.writers.latex import LaTeXTranslator +from sphinx.domains.python import PyModulelevel, PyClassmember + +# Support for checking for suspicious markup + +import suspicious + + +ISSUE_URI = 'https://bugs.python.org/issue%s' +SOURCE_URI = 'https://hg.python.org/cpython/file/default/%s' # monkey-patch reST parser to disable alphabetic and roman enumerated lists from docutils.parsers.rst.states import Body @@ -29,6 +46,9 @@ # monkey-patch HTML and LaTeX translators to keep doctest blocks in the # doctest docs themselves orig_visit_literal_block = HTMLTranslator.visit_literal_block +orig_depart_literal_block = LaTeXTranslator.depart_literal_block + + def new_visit_literal_block(self, node): meta = self.builder.env.metadata[self.builder.current_docname] old_trim_doctest_flags = self.highlighter.trim_doctest_flags @@ -39,9 +59,7 @@ finally: self.highlighter.trim_doctest_flags = old_trim_doctest_flags -HTMLTranslator.visit_literal_block = new_visit_literal_block -orig_depart_literal_block = LaTeXTranslator.depart_literal_block def new_depart_literal_block(self, node): meta = self.builder.env.metadata[self.curfilestack[-1]] old_trim_doctest_flags = self.highlighter.trim_doctest_flags @@ -52,8 +70,11 @@ finally: self.highlighter.trim_doctest_flags = old_trim_doctest_flags + +HTMLTranslator.visit_literal_block = new_visit_literal_block LaTeXTranslator.depart_literal_block = new_depart_literal_block + # Support for marking up and linking to bugs.python.org issues def issue_role(typ, rawtext, text, lineno, inliner, options={}, content=[]): @@ -101,9 +122,6 @@ # Support for documenting decorators -from sphinx import addnodes -from sphinx.domains.python import PyModulelevel, PyClassmember - class PyDecoratorMixin(object): def handle_signature(self, sig, signode): ret = super(PyDecoratorMixin, self).handle_signature(sig, signode) @@ -113,12 +131,14 @@ def needs_arglist(self): return False + class PyDecoratorFunction(PyDecoratorMixin, PyModulelevel): def run(self): # a decorator function is a function after all self.name = 'py:function' return PyModulelevel.run(self) + class PyDecoratorMethod(PyDecoratorMixin, PyClassmember): def run(self): self.name = 'py:method' @@ -162,7 +182,8 @@ classes=['versionmodified'])) else: para = nodes.paragraph('', '', - nodes.inline('', '%s.' % text, classes=['versionmodified'])) + nodes.inline('', '%s.' % text, + classes=['versionmodified'])) if len(node): node.insert(0, para) else: @@ -174,12 +195,10 @@ # Support for including Misc/NEWS -import re -import codecs - issue_re = re.compile('([Ii])ssue #([0-9]+)') whatsnew_re = re.compile(r"(?im)^what's new in (.*?)\??$") + class MiscNews(Directive): has_content = False required_arguments = 1 @@ -233,15 +252,6 @@ 'typesseq', 'typesseq-mutable', 'unary', 'while', 'with', 'yield' ] -from os import path -from time import asctime -from pprint import pformat -from docutils.io import StringOutput -from docutils.utils import new_document - -from sphinx.builders import Builder -from sphinx.writers.text import TextWriter - class PydocTopicsBuilder(Builder): name = 'pydoc-topics' @@ -281,16 +291,10 @@ f.close() -# Support for checking for suspicious markup - -import suspicious - - # Support for documenting Opcodes -import re +opcode_sig_re = re.compile(r'(\w+(?:\+\d)?)(?:\s*$(.*)$)?') -opcode_sig_re = re.compile(r'(\w+(?:\+\d)?)(?:\s*$(.*)$)?') def parse_opcode_signature(env, sig, signode): """Transform an opcode signature into RST nodes.""" @@ -311,12 +315,13 @@ pdbcmd_sig_re = re.compile(r'([a-z()!]+)\s*(.*)') # later... -#pdbargs_tokens_re = re.compile(r'''[a-zA-Z]+ | # identifiers +# pdbargs_tokens_re = re.compile(r'''[a-zA-Z]+ | # identifiers # [.,:]+ | # punctuation # [\[\]()] | # parens # \s+ # whitespace # ''', re.X) + def parse_pdb_command(env, sig, signode): """Transform a pdb command signature into RST nodes.""" m = pdbcmd_sig_re.match(sig) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): pyporting howto: fix link target
by georg.brandl Oct. 30, 2014

Oct. 30, 2014

https://hg.python.org/cpython/rev/100e8eae0b2b changeset: 93285:100e8eae0b2b branch: 3.4 parent: 93283:e016a7d1a0a9 user: Georg Brandl <georg(a)python.org> date: Thu Oct 30 22:52:02 2014 +0100 summary: pyporting howto: fix link target files: Doc/howto/pyporting.rst | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst --- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -565,10 +565,10 @@ --------------------------------------------------------- If you have Python 2 code but going forward only want to improve it as Python 3 -code, then you can use 2to3_ to translate your Python 2 code to Python 3 code. -This is only recommended, though, if your current version of your project is -going into maintenance mode and you want all new features to be exclusive to -Python 3. +code, then you can use :ref:`2to3 <2to3-reference>` to translate your Python 2 +code to Python 3 code. This is only recommended, though, if your current +version of your project is going into maintenance mode and you want all new +features to be exclusive to Python 3. Backporting Python 3 code to Python 2 -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge with 3.4
by georg.brandl Oct. 30, 2014

Oct. 30, 2014

https://hg.python.org/cpython/rev/fad22f068c7c changeset: 93286:fad22f068c7c parent: 93284:42d768a50926 parent: 93285:100e8eae0b2b user: Georg Brandl <georg(a)python.org> date: Thu Oct 30 22:52:06 2014 +0100 summary: merge with 3.4 files: Doc/howto/pyporting.rst | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst --- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -565,10 +565,10 @@ --------------------------------------------------------- If you have Python 2 code but going forward only want to improve it as Python 3 -code, then you can use 2to3_ to translate your Python 2 code to Python 3 code. -This is only recommended, though, if your current version of your project is -going into maintenance mode and you want all new features to be exclusive to -Python 3. +code, then you can use :ref:`2to3 <2to3-reference>` to translate your Python 2 +code to Python 3 code. This is only recommended, though, if your current +version of your project is going into maintenance mode and you want all new +features to be exclusive to Python 3. Backporting Python 3 code to Python 2 -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): rstlint: make the "html leaked markup" regex a bit less sensitive
by georg.brandl Oct. 30, 2014

Oct. 30, 2014

https://hg.python.org/cpython/rev/9fbf3b99da98 changeset: 93281:9fbf3b99da98 branch: 3.4 parent: 93278:0f50406f9aea user: Georg Brandl <georg(a)python.org> date: Thu Oct 30 22:49:54 2014 +0100 summary: rstlint: make the "html leaked markup" regex a bit less sensitive files: Doc/tools/rstlint.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py --- a/Doc/tools/rstlint.py +++ b/Doc/tools/rstlint.py @@ -45,7 +45,7 @@ all_directives = '(' + '|'.join(directives) + ')' seems_directive_re = re.compile(r'\.\. %s([^a-z:]|:(?!:))' % all_directives) default_role_re = re.compile(r'(^| )`\w([^`]*?\w)?`($| )') -leaked_markup_re = re.compile(r'[a-z]::[^=]|:[a-z]+:|`|\.\.\s*\w+:') +leaked_markup_re = re.compile(r'[a-z]::\s|`|\.\.\s*\w+:') checkers = {} -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge with 3.4
by georg.brandl Oct. 30, 2014

Oct. 30, 2014

https://hg.python.org/cpython/rev/b80aa9f887fe changeset: 93282:b80aa9f887fe parent: 93279:3b80ee0d4bb5 parent: 93281:9fbf3b99da98 user: Georg Brandl <georg(a)python.org> date: Thu Oct 30 22:50:00 2014 +0100 summary: merge with 3.4 files: Doc/tools/rstlint.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py --- a/Doc/tools/rstlint.py +++ b/Doc/tools/rstlint.py @@ -45,7 +45,7 @@ all_directives = '(' + '|'.join(directives) + ')' seems_directive_re = re.compile(r'\.\. %s([^a-z:]|:(?!:))' % all_directives) default_role_re = re.compile(r'(^| )`\w([^`]*?\w)?`($| )') -leaked_markup_re = re.compile(r'[a-z]::[^=]|:[a-z]+:|`|\.\.\s*\w+:') +leaked_markup_re = re.compile(r'[a-z]::\s|`|\.\.\s*\w+:') checkers = {} -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): distutils example: fix invalid rst in description string
by georg.brandl Oct. 30, 2014

Oct. 30, 2014

https://hg.python.org/cpython/rev/e016a7d1a0a9 changeset: 93283:e016a7d1a0a9 branch: 3.4 parent: 93281:9fbf3b99da98 user: Georg Brandl <georg(a)python.org> date: Thu Oct 30 22:50:46 2014 +0100 summary: distutils example: fix invalid rst in description string files: Doc/distutils/examples.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst --- a/Doc/distutils/examples.rst +++ b/Doc/distutils/examples.rst @@ -264,7 +264,7 @@ desc = """\ My description - ============= + ============== This is the description of the ``foobar`` package. """ -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge with 3.4
by georg.brandl Oct. 30, 2014

Oct. 30, 2014

https://hg.python.org/cpython/rev/42d768a50926 changeset: 93284:42d768a50926 parent: 93282:b80aa9f887fe parent: 93283:e016a7d1a0a9 user: Georg Brandl <georg(a)python.org> date: Thu Oct 30 22:50:48 2014 +0100 summary: merge with 3.4 files: Doc/distutils/examples.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst --- a/Doc/distutils/examples.rst +++ b/Doc/distutils/examples.rst @@ -264,7 +264,7 @@ desc = """\ My description - ============= + ============== This is the description of the ``foobar`` package. """ -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): rstlint: make the "html leaked markup" regex a bit less sensitive
by georg.brandl Oct. 30, 2014

Oct. 30, 2014

https://hg.python.org/cpython/rev/48825a84f87e changeset: 93280:48825a84f87e branch: 2.7 parent: 93275:4eb58e4633a9 user: Georg Brandl <georg(a)python.org> date: Thu Oct 30 22:49:06 2014 +0100 summary: rstlint: make the "html leaked markup" regex a bit less sensitive files: Doc/tools/rstlint.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py --- a/Doc/tools/rstlint.py +++ b/Doc/tools/rstlint.py @@ -44,7 +44,7 @@ all_directives = '(' + '|'.join(directives) + ')' seems_directive_re = re.compile(r'\.\. %s([^a-z:]|:(?!:))' % all_directives) default_role_re = re.compile(r'(^| )`\w([^`]*?\w)?`($| )') -leaked_markup_re = re.compile(r'[a-z]::[^=]|:[a-z]+:|`|\.\.\s*\w+:') +leaked_markup_re = re.compile(r'[a-z]::\s|`|\.\.\s*\w+:') checkers = {} -- Repository URL: https://hg.python.org/cpython

1 0