Mailman 3 November 2013 - Python-checkins

cpython (2.7): Update NEWS
by jason.coombs Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/4db15e465624 changeset: 86848:4db15e465624 branch: 2.7 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Sat Nov 02 11:43:40 2013 -0400 summary: Update NEWS files: Misc/NEWS | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ Library ------- +- Issue #19286: Directories in ``package_data`` are no longer added to + the filelist, preventing failure outlined in the ticket. + Tests ----- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #19286: [distutils] Only match files in build_py.find_data_files.
by jason.coombs Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/0a1cf947eff6 changeset: 86847:0a1cf947eff6 branch: 2.7 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Sat Nov 02 11:07:35 2013 -0400 summary: Issue #19286: [distutils] Only match files in build_py.find_data_files. files: Lib/distutils/command/build_py.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py --- a/Lib/distutils/command/build_py.py +++ b/Lib/distutils/command/build_py.py @@ -128,7 +128,8 @@ # Each pattern has to be converted to a platform-specific path filelist = glob(os.path.join(src_dir, convert_path(pattern))) # Files that match more than one pattern are only added once - files.extend([fn for fn in filelist if fn not in files]) + files.extend([fn for fn in filelist if fn not in files + and os.path.isfile(fn)]) return files def build_package_data(self): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #19286: Adding test demonstrating the failure when a directory is found
by jason.coombs Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/22bac968e226 changeset: 86846:22bac968e226 branch: 2.7 parent: 86838:0554e2d37bf8 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Sat Nov 02 11:29:33 2013 -0400 summary: Issue #19286: Adding test demonstrating the failure when a directory is found in the package_data globs. files: Lib/distutils/tests/test_build_py.py | 31 ++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/Lib/distutils/tests/test_build_py.py b/Lib/distutils/tests/test_build_py.py --- a/Lib/distutils/tests/test_build_py.py +++ b/Lib/distutils/tests/test_build_py.py @@ -99,6 +99,37 @@ os.chdir(cwd) sys.stdout = old_stdout + def test_dir_in_package_data(self): + """ + A directory in package_data should not be added to the filelist. + """ + # See bug 19286 + sources = self.mkdtemp() + pkg_dir = os.path.join(sources, "pkg") + + os.mkdir(pkg_dir) + open(os.path.join(pkg_dir, "__init__.py"), "w").close() + + docdir = os.path.join(pkg_dir, "doc") + os.mkdir(docdir) + open(os.path.join(docdir, "testfile"), "w").close() + + # create the directory that could be incorrectly detected as a file + os.mkdir(os.path.join(docdir, 'otherdir')) + + os.chdir(sources) + dist = Distribution({"packages": ["pkg"], + "package_data": {"pkg": ["doc/*"]}}) + # script_name need not exist, it just need to be initialized + dist.script_name = os.path.join(sources, "setup.py") + dist.script_args = ["build"] + dist.parse_command_line() + + try: + dist.run_commands() + except DistutilsFileError: + self.fail("failed package_data when data dir includes a dir") + def test_dont_write_bytecode(self): # makes sure byte_compile is not used pkg_dir, dist = self.create_dist() -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Merge test_htmlparser changes from 3.3.
by ezio.melotti Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/0ce6c0a47676 changeset: 86845:0ce6c0a47676 parent: 86842:0a56709eb798 parent: 86844:b77c1a19028e user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sat Nov 02 17:50:02 2013 +0200 summary: Merge test_htmlparser changes from 3.3. files: Lib/test/test_htmlparser.py | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py --- a/Lib/test/test_htmlparser.py +++ b/Lib/test/test_htmlparser.py @@ -764,11 +764,5 @@ ("data", "spam"), ("endtag", "a")]) - -def test_main(): - support.run_unittest(HTMLParserStrictTestCase, HTMLParserTolerantTestCase, - AttributesStrictTestCase, AttributesTolerantTestCase) - - if __name__ == "__main__": - test_main() + unittest.main() -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Use unittest.main() in test_htmlparser.
by ezio.melotti Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/b77c1a19028e changeset: 86844:b77c1a19028e branch: 3.3 parent: 86839:a58fce53e873 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sat Nov 02 17:49:08 2013 +0200 summary: Use unittest.main() in test_htmlparser. files: Lib/test/test_htmlparser.py | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py --- a/Lib/test/test_htmlparser.py +++ b/Lib/test/test_htmlparser.py @@ -753,11 +753,5 @@ ("data", "spam"), ("endtag", "a")]) - -def test_main(): - support.run_unittest(HTMLParserStrictTestCase, HTMLParserTolerantTestCase, - AttributesStrictTestCase, AttributesTolerantTestCase) - - if __name__ == "__main__": - test_main() + unittest.main() -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #19085: Fix Tkinter tests with Tcl/Tk 8.4.
by serhiy.storchaka Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/278d15021d9a changeset: 86843:278d15021d9a branch: 2.7 parent: 86838:0554e2d37bf8 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 02 17:27:59 2013 +0200 summary: Issue #19085: Fix Tkinter tests with Tcl/Tk 8.4. files: Lib/lib-tk/test/test_tkinter/test_widgets.py | 12 ++++---- Lib/lib-tk/test/test_ttk/test_widgets.py | 14 +++++----- Lib/lib-tk/test/widget_tests.py | 3 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Lib/lib-tk/test/test_tkinter/test_widgets.py b/Lib/lib-tk/test/test_tkinter/test_widgets.py --- a/Lib/lib-tk/test/test_tkinter/test_widgets.py +++ b/Lib/lib-tk/test/test_tkinter/test_widgets.py @@ -4,7 +4,7 @@ from test.test_support import requires, run_unittest from test_ttk.support import tcl_version, requires_tcl, widget_eq -from widget_tests import (add_standard_options, noconv, int_round, +from widget_tests import (add_standard_options, noconv, noconv_meth, int_round, AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests) @@ -12,7 +12,7 @@ class AbstractToplevelTest(AbstractWidgetTest, PixelSizeTests): - _conv_pad_pixels = noconv + _conv_pad_pixels = noconv_meth def test_class(self): widget = self.create() @@ -130,7 +130,7 @@ class AbstractLabelTest(AbstractWidgetTest, IntegerSizeTests): - _conv_pixels = noconv + _conv_pixels = noconv_meth def test_highlightthickness(self): widget = self.create() @@ -240,7 +240,7 @@ 'takefocus', 'text', 'textvariable', 'underline', 'width', 'wraplength', ) - _conv_pixels = AbstractWidgetTest._conv_pixels + _conv_pixels = staticmethod(AbstractWidgetTest._conv_pixels) def _create(self, **kwargs): return Tkinter.Menubutton(self.root, **kwargs) @@ -858,7 +858,7 @@ 'postcommand', 'relief', 'selectcolor', 'takefocus', 'tearoff', 'tearoffcommand', 'title', 'type', ) - _conv_pixels = noconv + _conv_pixels = noconv_meth def _create(self, **kwargs): return Tkinter.Menu(self.root, **kwargs) @@ -894,7 +894,7 @@ 'justify', 'padx', 'pady', 'relief', 'takefocus', 'text', 'textvariable', 'width', ) - _conv_pad_pixels = noconv + _conv_pad_pixels = noconv_meth def _create(self, **kwargs): return Tkinter.Message(self.root, **kwargs) diff --git a/Lib/lib-tk/test/test_ttk/test_widgets.py b/Lib/lib-tk/test/test_ttk/test_widgets.py --- a/Lib/lib-tk/test/test_ttk/test_widgets.py +++ b/Lib/lib-tk/test/test_ttk/test_widgets.py @@ -7,7 +7,7 @@ import support from test_functions import MockTclObj, MockStateSpec from support import tcl_version -from widget_tests import (add_standard_options, noconv, +from widget_tests import (add_standard_options, noconv, noconv_meth, AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests) @@ -117,7 +117,7 @@ class AbstractToplevelTest(AbstractWidgetTest, PixelSizeTests): - _conv_pixels = noconv + _conv_pixels = noconv_meth @add_standard_options(StandardTtkOptionsTests) @@ -197,7 +197,7 @@ 'takefocus', 'text', 'textvariable', 'underline', 'width', 'wraplength', ) - _conv_pixels = noconv + _conv_pixels = noconv_meth def _create(self, **kwargs): return ttk.Label(self.root, **kwargs) @@ -362,7 +362,7 @@ expected=('mon', 'tue', 'wed', 'thur')) self.checkParam(self.combo, 'values', ('mon', 'tue', 'wed', 'thur')) self.checkParam(self.combo, 'values', (42, 3.14, '', 'any string')) - self.checkParam(self.combo, 'values', '') + self.checkParam(self.combo, 'values', () if tcl_version < (8, 5) else '') self.combo['values'] = ['a', 1, 'c'] @@ -758,7 +758,7 @@ 'class', 'command', 'cursor', 'from', 'length', 'orient', 'style', 'takefocus', 'to', 'value', 'variable', ) - _conv_pixels = noconv + _conv_pixels = noconv_meth default_orient = 'horizontal' def setUp(self): @@ -862,7 +862,7 @@ 'mode', 'maximum', 'phase', 'style', 'takefocus', 'value', 'variable', ) - _conv_pixels = noconv + _conv_pixels = noconv_meth default_orient = 'horizontal' def _create(self, **kwargs): @@ -1144,7 +1144,7 @@ self.checkParam(widget, 'columns', 'a b c', expected=('a', 'b', 'c')) self.checkParam(widget, 'columns', ('a', 'b', 'c')) - self.checkParam(widget, 'columns', '') + self.checkParam(widget, 'columns', () if tcl_version < (8, 5) else '') def test_displaycolumns(self): widget = self.create() diff --git a/Lib/lib-tk/test/widget_tests.py b/Lib/lib-tk/test/widget_tests.py --- a/Lib/lib-tk/test/widget_tests.py +++ b/Lib/lib-tk/test/widget_tests.py @@ -6,6 +6,7 @@ noconv = str if tcl_version < (8, 5) else False +noconv_meth = noconv and staticmethod(noconv) def int_round(x): return int(round(x)) @@ -13,7 +14,7 @@ _sentinel = object() class AbstractWidgetTest(object): - _conv_pixels = staticmethod(int_round) if tcl_version[:2] != (8, 5) else int + _conv_pixels = staticmethod(int_round if tcl_version[:2] != (8, 5) else int) _conv_pad_pixels = None wantobjects = True -- Repository URL: http://hg.python.org/cpython

1 0

cpython: #15114: The html.parser module now raises a DeprecationWarning when the strict
by ezio.melotti Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/0a56709eb798 changeset: 86842:0a56709eb798 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sat Nov 02 17:08:24 2013 +0200 summary: #15114: The html.parser module now raises a DeprecationWarning when the strict argument of HTMLParser or the HTMLParser.error method are used. files: Doc/library/html.parser.rst | 4 ++-- Lib/html/parser.py | 14 ++++++++++---- Lib/test/test_htmlparser.py | 17 ++++++++++++++--- Misc/NEWS | 3 +++ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Doc/library/html.parser.rst b/Doc/library/html.parser.rst --- a/Doc/library/html.parser.rst +++ b/Doc/library/html.parser.rst @@ -74,7 +74,7 @@ def handle_data(self, data): print("Encountered some data :", data) - parser = MyHTMLParser(strict=False) + parser = MyHTMLParser() parser.feed('<html><head><title>Test</title></head>' '<body><h1>Parse me!</h1></body></html>') @@ -272,7 +272,7 @@ def handle_decl(self, data): print("Decl :", data) - parser = MyHTMLParser(strict=False) + parser = MyHTMLParser() Parsing a doctype:: diff --git a/Lib/html/parser.py b/Lib/html/parser.py --- a/Lib/html/parser.py +++ b/Lib/html/parser.py @@ -94,6 +94,8 @@ return result +_strict_sentinel = object() + class HTMLParser(_markupbase.ParserBase): """Find tags and other markup and call handler functions. @@ -116,16 +118,18 @@ CDATA_CONTENT_ELEMENTS = ("script", "style") - def __init__(self, strict=False): + def __init__(self, strict=_strict_sentinel): """Initialize and reset this instance. If strict is set to False (the default) the parser will parse invalid markup, otherwise it will raise an error. Note that the strict mode - is deprecated. + and argument are deprecated. """ - if strict: - warnings.warn("The strict mode is deprecated.", + if strict is not _strict_sentinel: + warnings.warn("The strict argument and mode are deprecated.", DeprecationWarning, stacklevel=2) + else: + strict = False # default self.strict = strict self.reset() @@ -151,6 +155,8 @@ self.goahead(1) def error(self, message): + warnings.warn("The 'error' method is deprecated.", + DeprecationWarning, stacklevel=2) raise HTMLParseError(message, self.getpos()) __starttag_text = None diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py --- a/Lib/test/test_htmlparser.py +++ b/Lib/test/test_htmlparser.py @@ -96,7 +96,9 @@ parser = self.get_collector() parser.feed(source) parser.close() - self.assertRaises(html.parser.HTMLParseError, parse) + with self.assertRaises(html.parser.HTMLParseError): + with self.assertWarns(DeprecationWarning): + parse() class HTMLParserStrictTestCase(TestCaseBase): @@ -360,7 +362,16 @@ class HTMLParserTolerantTestCase(HTMLParserStrictTestCase): def get_collector(self): - return EventCollector(strict=False) + return EventCollector() + + def test_deprecation_warnings(self): + with self.assertWarns(DeprecationWarning): + EventCollector(strict=True) + with self.assertWarns(DeprecationWarning): + EventCollector(strict=False) + with self.assertRaises(html.parser.HTMLParseError): + with self.assertWarns(DeprecationWarning): + EventCollector().error('test') def test_tolerant_parsing(self): self._run_check('<html <html>te>>xt&a<<bc</a></html>\n' @@ -676,7 +687,7 @@ class AttributesTolerantTestCase(AttributesStrictTestCase): def get_collector(self): - return EventCollector(strict=False) + return EventCollector() def test_attr_funky_names2(self): self._run_check( diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -31,6 +31,9 @@ Library ------- +- Issue #15114: The html.parser module now raises a DeprecationWarning when the + strict argument of HTMLParser or the HTMLParser.error method are used. + - Issue #19410: Undo the special-casing removal of '' for importlib.machinery.FileFinder. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #19085. Try to fix tkinter tests on Windows.
by serhiy.storchaka Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/cee56ef59a6a changeset: 86841:cee56ef59a6a user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 02 16:41:23 2013 +0200 summary: Issue #19085. Try to fix tkinter tests on Windows. files: Lib/tkinter/test/test_tkinter/test_widgets.py | 14 +++++----- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py --- a/Lib/tkinter/test/test_tkinter/test_widgets.py +++ b/Lib/tkinter/test/test_tkinter/test_widgets.py @@ -73,7 +73,10 @@ def test_screen(self): widget = self.create() self.assertEqual(widget['screen'], '') - display = os.environ['DISPLAY'] + try: + display = os.environ['DISPLAY'] + except KeyError: + self.skipTest('No $DISPLAY set.') self.checkInvalidParam(widget, 'screen', display, errmsg="can't modify -screen option after widget is created") widget2 = self.create(screen=display) @@ -82,13 +85,10 @@ def test_use(self): widget = self.create() self.assertEqual(widget['use'], '') - widget1 = self.create(container=True) - self.assertEqual(widget1['use'], '') - self.checkInvalidParam(widget1, 'use', '0x44022', - errmsg="can't modify -use option after widget is created") - wid = hex(widget1.winfo_id()) + parent = self.create(container=True) + wid = parent.winfo_id() widget2 = self.create(use=wid) - self.assertEqual(widget2['use'], wid) + self.assertEqual(int(widget2['use']), wid) @add_standard_options(StandardOptionsTests) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #10734: Fix and re-enable test_ttk test_heading_callback.
by serhiy.storchaka Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/f647a2c5f290 changeset: 86840:f647a2c5f290 parent: 86837:e92bba5b53db parent: 86839:a58fce53e873 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 02 10:54:58 2013 +0200 summary: Issue #10734: Fix and re-enable test_ttk test_heading_callback. files: Lib/tkinter/test/test_ttk/test_widgets.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/Lib/tkinter/test/test_ttk/test_widgets.py @@ -1369,12 +1369,10 @@ self.assertRaises(tkinter.TclError, self.tv.heading, '#0', anchor=1) - # XXX skipping for now; should be fixed to work with newer ttk - @unittest.skip("skipping pending resolution of Issue #10734") def test_heading_callback(self): def simulate_heading_click(x, y): support.simulate_mouse_click(self.tv, x, y) - self.tv.update_idletasks() + self.tv.update() success = [] # no success for now -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #10734: Fix and re-enable test_ttk test_heading_callback.
by serhiy.storchaka Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/a58fce53e873 changeset: 86839:a58fce53e873 branch: 3.3 parent: 86834:92e268f2719e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 02 10:54:31 2013 +0200 summary: Issue #10734: Fix and re-enable test_ttk test_heading_callback. files: Lib/tkinter/test/test_ttk/test_widgets.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/Lib/tkinter/test/test_ttk/test_widgets.py @@ -1369,12 +1369,10 @@ self.assertRaises(tkinter.TclError, self.tv.heading, '#0', anchor=1) - # XXX skipping for now; should be fixed to work with newer ttk - @unittest.skip("skipping pending resolution of Issue #10734") def test_heading_callback(self): def simulate_heading_click(x, y): support.simulate_mouse_click(self.tv, x, y) - self.tv.update_idletasks() + self.tv.update() success = [] # no success for now -- Repository URL: http://hg.python.org/cpython

1 0