Mailman 3 November 2013 - Python-checkins

cpython (merge 3.3 -> default): Null merge
by serhiy.storchaka Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/fdc10b073e79 changeset: 86858:fdc10b073e79 parent: 86857:bc274d0aab88 parent: 86856:576ffbaa6363 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 02 18:53:39 2013 +0200 summary: Null merge files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): Merge heads
by serhiy.storchaka Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/bc274d0aab88 changeset: 86857:bc274d0aab88 parent: 86855:ab3b58f21fe7 parent: 86852:722da29107b7 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 02 18:53:19 2013 +0200 summary: Merge heads files: Lib/test/_test_multiprocessing.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -723,7 +723,7 @@ start = time.time() self.assertRaises(pyqueue.Empty, q.get, True, 0.2) delta = time.time() - start - self.assertGreaterEqual(delta, 0.19) + self.assertGreaterEqual(delta, 0.18) # # -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> 3.3): Merge heads
by serhiy.storchaka Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/576ffbaa6363 changeset: 86856:576ffbaa6363 branch: 3.3 parent: 86853:f25679db52fb parent: 86851:f70142e3799b user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 02 18:53:06 2013 +0200 summary: Merge heads files: Lib/test/test_multiprocessing.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -716,7 +716,7 @@ start = time.time() self.assertRaises(pyqueue.Empty, q.get, True, 0.2) delta = time.time() - start - self.assertGreaterEqual(delta, 0.19) + self.assertGreaterEqual(delta, 0.18) # # -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Null merge
by serhiy.storchaka Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/ab3b58f21fe7 changeset: 86855:ab3b58f21fe7 parent: 86850:f051d3aaaef4 parent: 86853:f25679db52fb user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 02 18:51:30 2013 +0200 summary: Null merge files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #19085: Fixed some Tkinter tests on Windows.
by serhiy.storchaka Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/4a2afda8f187 changeset: 86854:4a2afda8f187 branch: 2.7 parent: 86849:2b085aba89f9 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 02 18:50:53 2013 +0200 summary: Issue #19085: Fixed some Tkinter tests on Windows. files: Lib/lib-tk/test/test_tkinter/test_widgets.py | 14 +++++----- 1 files changed, 7 insertions(+), 7 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 @@ -70,7 +70,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) @@ -79,13 +82,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 (3.3): Issue #19085: Fixed some Tkinter tests on Windows.
by serhiy.storchaka Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/f25679db52fb changeset: 86853:f25679db52fb branch: 3.3 parent: 86844:b77c1a19028e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 02 18:50:42 2013 +0200 summary: Issue #19085: Fixed some 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): Merge.
by richard.oudkerk Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/722da29107b7 changeset: 86852:722da29107b7 parent: 86850:f051d3aaaef4 parent: 86851:f70142e3799b user: Richard Oudkerk <shibturn(a)gmail.com> date: Sat Nov 02 16:47:08 2013 +0000 summary: Merge. files: Lib/test/_test_multiprocessing.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -723,7 +723,7 @@ start = time.time() self.assertRaises(pyqueue.Empty, q.get, True, 0.2) delta = time.time() - start - self.assertGreaterEqual(delta, 0.19) + self.assertGreaterEqual(delta, 0.18) # # -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Relax timeout test.
by richard.oudkerk Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/f70142e3799b changeset: 86851:f70142e3799b branch: 3.3 parent: 86844:b77c1a19028e user: Richard Oudkerk <shibturn(a)gmail.com> date: Sat Nov 02 16:46:32 2013 +0000 summary: Relax timeout test. files: Lib/test/test_multiprocessing.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -716,7 +716,7 @@ start = time.time() self.assertRaises(pyqueue.Empty, q.get, True, 0.2) delta = time.time() - start - self.assertGreaterEqual(delta, 0.19) + self.assertGreaterEqual(delta, 0.18) # # -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Relax test for process return code on Windows.
by richard.oudkerk Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/f051d3aaaef4 changeset: 86850:f051d3aaaef4 parent: 86845:0ce6c0a47676 user: Richard Oudkerk <shibturn(a)gmail.com> date: Sat Nov 02 16:38:58 2013 +0000 summary: Relax test for process return code on Windows. files: Lib/test/test_asyncio/test_events.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -961,14 +961,14 @@ def check_terminated(self, returncode): if sys.platform == 'win32': self.assertIsInstance(returncode, int) - self.assertNotEqual(0, returncode) + # expect 1 but sometimes get 0 else: self.assertEqual(-signal.SIGTERM, returncode) def check_killed(self, returncode): if sys.platform == 'win32': self.assertIsInstance(returncode, int) - self.assertNotEqual(0, returncode) + # expect 1 but sometimes get 0 else: self.assertEqual(-signal.SIGKILL, returncode) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): Merge
by jason.coombs Nov. 2, 2013

Nov. 2, 2013

http://hg.python.org/cpython/rev/2b085aba89f9 changeset: 86849:2b085aba89f9 branch: 2.7 parent: 86843:278d15021d9a parent: 86848:4db15e465624 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Sat Nov 02 11:57:54 2013 -0400 summary: Merge files: Lib/distutils/command/build_py.py | 3 +- Lib/distutils/tests/test_build_py.py | 31 ++++++++++++++++ Misc/NEWS | 3 + 3 files changed, 36 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): 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() 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