Mailman 3 February 2019 - Python-checkins

Document the surprising sideeffect PyErr_Print(). (#12081)
by Gregory P. Smith Feb. 27, 2019

Feb. 27, 2019

https://github.com/python/cpython/commit/4173772031747a9b249be4100b4aa9eda8… commit: 4173772031747a9b249be4100b4aa9eda805ea23 branch: master author: Gregory P. Smith <greg(a)krypto.org> committer: GitHub <noreply(a)github.com> date: 2019-02-27T15:27:32-08:00 summary: Document the surprising sideeffect PyErr_Print(). (#12081) Did you know an API documented as printing the pending traceback would sometimes exit the process? You do now. files: M Doc/c-api/exceptions.rst diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst index 6dd0c02c6d7b..8c5f66cbef72 100644 --- a/Doc/c-api/exceptions.rst +++ b/Doc/c-api/exceptions.rst @@ -53,8 +53,12 @@ Printing and clearing .. c:function:: void PyErr_PrintEx(int set_sys_last_vars) Print a standard traceback to ``sys.stderr`` and clear the error indicator. - Call this function only when the error indicator is set. (Otherwise it will - cause a fatal error!) + **Unless** the error is a ``SystemExit``. In that case the no traceback + is printed and Python process will exit with the error code specified by + the ``SystemExit`` instance. + + Call this function **only** when the error indicator is set. Otherwise it + will cause a fatal error! If *set_sys_last_vars* is nonzero, the variables :data:`sys.last_type`, :data:`sys.last_value` and :data:`sys.last_traceback` will be set to the

1 0

Fix grammar error in timeit module docs (GH-12066)
by Miss Islington (bot) Feb. 27, 2019

Feb. 27, 2019

https://github.com/python/cpython/commit/4064089fce57c6fb2d1df9f3fb51d3fd55… commit: 4064089fce57c6fb2d1df9f3fb51d3fd5557696b branch: master author: Shiv Dhar <shivdhar(a)gmail.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-02-27T15:21:15-08:00 summary: Fix grammar error in timeit module docs (GH-12066) skip issue skip news files: M Doc/library/timeit.rst diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst index 197b8a76fc38..8ca37034f79b 100644 --- a/Doc/library/timeit.rst +++ b/Doc/library/timeit.rst @@ -129,7 +129,7 @@ The module defines three convenience functions and a public class: By default, :meth:`.timeit` temporarily turns off :term:`garbage collection` during the timing. The advantage of this approach is that - it makes independent timings more comparable. This disadvantage is + it makes independent timings more comparable. The disadvantage is that GC may be an important component of the performance of the function being measured. If so, GC can be re-enabled as the first statement in the *setup* string. For example::

1 0

Update FAQ to point to Infrastructure Team website. (GH-12079)
by Ned Deily Feb. 27, 2019

Feb. 27, 2019

https://github.com/python/cpython/commit/60ef9b05def9fd9e26959ffccc1811a32f… commit: 60ef9b05def9fd9e26959ffccc1811a32fb7dc0f branch: 2.7 author: Ned Deily <nad(a)python.org> committer: GitHub <noreply(a)github.com> date: 2019-02-27T17:43:13-05:00 summary: Update FAQ to point to Infrastructure Team website. (GH-12079) files: M Doc/faq/general.rst diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 887dea74f5f1..e9b3fafbf55f 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -268,14 +268,8 @@ Python references; or perhaps search for "Python" and "language". Where in the world is www.python.org located? --------------------------------------------- -The Python project's infrastructure is located all over the world. -`www.python.org <https://www.python.org>`_ is graciously hosted by `Rackspace -<https://www.rackspace.com>`_, with CDN caching provided by `Fastly -<https://www.fastly.com>`_. `Upfront Systems -<http://www.upfrontsystems.co.za/>`_ hosts `bugs.python.org -<https://bugs.python.org>`_. Many other Python services like `the Wiki -<https://wiki.python.org>`_ are hosted by `Oregon State -University Open Source Lab <https://osuosl.org>`_. +The Python project's infrastructure is located all over the world and is managed +by the Python Infrastructure Team. Details `here <http://infra.psf.io>`__. Why is it called Python?

1 0

[3.7] Update FAQ to point to Infrastructure Team website. (GH-12077) (GH-12078)
by Miss Islington (bot) Feb. 27, 2019

Feb. 27, 2019

https://github.com/python/cpython/commit/197e46829b440484c030a4d9734867551a… commit: 197e46829b440484c030a4d9734867551acae79d branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-02-27T14:29:13-08:00 summary: [3.7] Update FAQ to point to Infrastructure Team website. (GH-12077) (GH-12078) (cherry picked from commit ccb92e814d289b89bccf9ad1b7d2ec6ecdebbfcb) Co-authored-by: Ned Deily <nad(a)python.org> files: M Doc/faq/general.rst diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 90fd69e72960..7ee340d7957c 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -268,14 +268,8 @@ Python references; or perhaps search for "Python" and "language". Where in the world is www.python.org located? --------------------------------------------- -The Python project's infrastructure is located all over the world. -`www.python.org <https://www.python.org>`_ is graciously hosted by `Rackspace -<https://www.rackspace.com>`_, with CDN caching provided by `Fastly -<https://www.fastly.com>`_. `Upfront Systems -<http://www.upfrontsoftware.co.za>`_ hosts `bugs.python.org -<https://bugs.python.org>`_. Many other Python services like `the Wiki -<https://wiki.python.org>`_ are hosted by `Oregon State -University Open Source Lab <https://osuosl.org>`_. +The Python project's infrastructure is located all over the world and is managed +by the Python Infrastructure Team. Details `here <http://infra.psf.io>`__. Why is it called Python?

1 0

Update FAQ to point to Infrastructure Team website. (GH-12077)
by Ned Deily Feb. 27, 2019

Feb. 27, 2019

https://github.com/python/cpython/commit/ccb92e814d289b89bccf9ad1b7d2ec6ecd… commit: ccb92e814d289b89bccf9ad1b7d2ec6ecdebbfcb branch: master author: Ned Deily <nad(a)python.org> committer: GitHub <noreply(a)github.com> date: 2019-02-27T17:23:34-05:00 summary: Update FAQ to point to Infrastructure Team website. (GH-12077) files: M Doc/faq/general.rst diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 90fd69e72960..7ee340d7957c 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -268,14 +268,8 @@ Python references; or perhaps search for "Python" and "language". Where in the world is www.python.org located? --------------------------------------------- -The Python project's infrastructure is located all over the world. -`www.python.org <https://www.python.org>`_ is graciously hosted by `Rackspace -<https://www.rackspace.com>`_, with CDN caching provided by `Fastly -<https://www.fastly.com>`_. `Upfront Systems -<http://www.upfrontsoftware.co.za>`_ hosts `bugs.python.org -<https://bugs.python.org>`_. Many other Python services like `the Wiki -<https://wiki.python.org>`_ are hosted by `Oregon State -University Open Source Lab <https://osuosl.org>`_. +The Python project's infrastructure is located all over the world and is managed +by the Python Infrastructure Team. Details `here <http://infra.psf.io>`__. Why is it called Python?

1 0

bpo-36096: IDLE: Refactor class variables in colorizer (GH-12002) (GH-12075)
by Terry Jan Reedy Feb. 27, 2019

Feb. 27, 2019

https://github.com/python/cpython/commit/488aabafe2f1c5db05a6c1a7a8b49d7b89… commit: 488aabafe2f1c5db05a6c1a7a8b49d7b89b1f36b branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2019-02-27T14:14:06-05:00 summary: bpo-36096: IDLE: Refactor class variables in colorizer (GH-12002) (GH-12075) (cherry picked from commit ed1deb0719f0ac1b08a374e30ad26a701d4d51a2) Co-authored-by: Cheryl Sabella <cheryl.sabella(a)gmail.com> files: A Misc/NEWS.d/next/IDLE/2019-02-23-17-53-53.bpo-36096.mN5Ly3.rst M Lib/idlelib/colorizer.py M Lib/idlelib/idle_test/test_colorizer.py diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py index 57942e8a7ca2..fd13281fb295 100644 --- a/Lib/idlelib/colorizer.py +++ b/Lib/idlelib/colorizer.py @@ -55,26 +55,35 @@ def color_config(text): class ColorDelegator(Delegator): """Delegator for syntax highlighting (text coloring). - Class variables: - after_id: Identifier for scheduled after event. + Instance variables: + delegate: Delegator below this one in the stack, meaning the + one this one delegates to. + + Used to track state: + after_id: Identifier for scheduled after event, which is a + timer for colorizing the text. allow_colorizing: Boolean toggle for applying colorizing. colorizing: Boolean flag when colorizing is in process. stop_colorizing: Boolean flag to end an active colorizing process. close_when_done: Widget to destroy after colorizing process completes (doesn't seem to be used by IDLE). - - Instance variables: - delegate: Delegator below this one in the stack, meaning the - one this one delegates to. """ def __init__(self): Delegator.__init__(self) + self.init_state() self.prog = prog self.idprog = idprog self.LoadTagDefs() + def init_state(self): + "Initialize variables that track colorizing state." + self.after_id = None + self.allow_colorizing = True + self.stop_colorizing = False + self.colorizing = False + def setdelegate(self, delegate): """Set the delegate for this instance. @@ -134,11 +143,6 @@ def delete(self, index1, index2=None): self.delegate.delete(index1, index2) self.notify_range(index1) - after_id = None - allow_colorizing = True - stop_colorizing = False - colorizing = False - def notify_range(self, index1, index2=None): "Mark text changes for processing and restart colorizing, if active." self.tag_add("TODO", index1, index2) diff --git a/Lib/idlelib/idle_test/test_colorizer.py b/Lib/idlelib/idle_test/test_colorizer.py index 4ade5a149b48..c31c49236ca0 100644 --- a/Lib/idlelib/idle_test/test_colorizer.py +++ b/Lib/idlelib/idle_test/test_colorizer.py @@ -100,7 +100,7 @@ def test_color_config(self): eq(text['inactiveselectbackground'], 'gray') -class ColorDelegatorTest(unittest.TestCase): +class ColorDelegatorInstantiationTest(unittest.TestCase): @classmethod def setUpClass(cls): @@ -108,25 +108,19 @@ def setUpClass(cls): root = cls.root = Tk() root.withdraw() text = cls.text = Text(root) - cls.percolator = Percolator(text) - # Delegator stack = [Delagator(text)] @classmethod def tearDownClass(cls): - cls.percolator.redir.close() - del cls.percolator, cls.text + del cls.text cls.root.update_idletasks() cls.root.destroy() del cls.root def setUp(self): self.color = colorizer.ColorDelegator() - self.percolator.insertfilter(self.color) - # Calls color.setdelagate(Delagator(text)). def tearDown(self): self.color.close() - self.percolator.removefilter(self.color) self.text.delete('1.0', 'end') self.color.resetcache() del self.color @@ -134,12 +128,50 @@ def tearDown(self): def test_init(self): color = self.color self.assertIsInstance(color, colorizer.ColorDelegator) - # The following are class variables. + + def test_init_state(self): + # init_state() is called during the instantiation of + # ColorDelegator in setUp(). + color = self.color + self.assertIsNone(color.after_id) self.assertTrue(color.allow_colorizing) self.assertFalse(color.colorizing) + self.assertFalse(color.stop_colorizing) + + +class ColorDelegatorTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + root = cls.root = Tk() + root.withdraw() + text = cls.text = Text(root) + cls.percolator = Percolator(text) + # Delegator stack = [Delegator(text)] + + @classmethod + def tearDownClass(cls): + cls.percolator.redir.close() + del cls.percolator, cls.text + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.color = colorizer.ColorDelegator() + self.percolator.insertfilter(self.color) + # Calls color.setdelegate(Delegator(text)). + + def tearDown(self): + self.color.close() + self.percolator.removefilter(self.color) + self.text.delete('1.0', 'end') + self.color.resetcache() + del self.color def test_setdelegate(self): - # Called in setUp. + # Called in setUp when filter is attached to percolator. color = self.color self.assertIsInstance(color.delegate, colorizer.Delegator) # It is too late to mock notify_range, so test side effect. diff --git a/Misc/NEWS.d/next/IDLE/2019-02-23-17-53-53.bpo-36096.mN5Ly3.rst b/Misc/NEWS.d/next/IDLE/2019-02-23-17-53-53.bpo-36096.mN5Ly3.rst new file mode 100644 index 000000000000..cd6f76e9ac2b --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2019-02-23-17-53-53.bpo-36096.mN5Ly3.rst @@ -0,0 +1 @@ +Refactor class variables to instance variables in colorizer.

1 0

bpo-36096: IDLE: Refactor class variables in colorizer (GH-12002)
by Cheryl Sabella Feb. 27, 2019

Feb. 27, 2019

https://github.com/python/cpython/commit/ed1deb0719f0ac1b08a374e30ad26a701d… commit: ed1deb0719f0ac1b08a374e30ad26a701d4d51a2 branch: master author: Cheryl Sabella <cheryl.sabella(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-02-27T08:21:16-05:00 summary: bpo-36096: IDLE: Refactor class variables in colorizer (GH-12002) files: A Misc/NEWS.d/next/IDLE/2019-02-23-17-53-53.bpo-36096.mN5Ly3.rst M Lib/idlelib/colorizer.py M Lib/idlelib/idle_test/test_colorizer.py diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py index 57942e8a7ca2..fd13281fb295 100644 --- a/Lib/idlelib/colorizer.py +++ b/Lib/idlelib/colorizer.py @@ -55,26 +55,35 @@ def color_config(text): class ColorDelegator(Delegator): """Delegator for syntax highlighting (text coloring). - Class variables: - after_id: Identifier for scheduled after event. + Instance variables: + delegate: Delegator below this one in the stack, meaning the + one this one delegates to. + + Used to track state: + after_id: Identifier for scheduled after event, which is a + timer for colorizing the text. allow_colorizing: Boolean toggle for applying colorizing. colorizing: Boolean flag when colorizing is in process. stop_colorizing: Boolean flag to end an active colorizing process. close_when_done: Widget to destroy after colorizing process completes (doesn't seem to be used by IDLE). - - Instance variables: - delegate: Delegator below this one in the stack, meaning the - one this one delegates to. """ def __init__(self): Delegator.__init__(self) + self.init_state() self.prog = prog self.idprog = idprog self.LoadTagDefs() + def init_state(self): + "Initialize variables that track colorizing state." + self.after_id = None + self.allow_colorizing = True + self.stop_colorizing = False + self.colorizing = False + def setdelegate(self, delegate): """Set the delegate for this instance. @@ -134,11 +143,6 @@ def delete(self, index1, index2=None): self.delegate.delete(index1, index2) self.notify_range(index1) - after_id = None - allow_colorizing = True - stop_colorizing = False - colorizing = False - def notify_range(self, index1, index2=None): "Mark text changes for processing and restart colorizing, if active." self.tag_add("TODO", index1, index2) diff --git a/Lib/idlelib/idle_test/test_colorizer.py b/Lib/idlelib/idle_test/test_colorizer.py index 4ade5a149b48..c31c49236ca0 100644 --- a/Lib/idlelib/idle_test/test_colorizer.py +++ b/Lib/idlelib/idle_test/test_colorizer.py @@ -100,7 +100,7 @@ def test_color_config(self): eq(text['inactiveselectbackground'], 'gray') -class ColorDelegatorTest(unittest.TestCase): +class ColorDelegatorInstantiationTest(unittest.TestCase): @classmethod def setUpClass(cls): @@ -108,25 +108,19 @@ def setUpClass(cls): root = cls.root = Tk() root.withdraw() text = cls.text = Text(root) - cls.percolator = Percolator(text) - # Delegator stack = [Delagator(text)] @classmethod def tearDownClass(cls): - cls.percolator.redir.close() - del cls.percolator, cls.text + del cls.text cls.root.update_idletasks() cls.root.destroy() del cls.root def setUp(self): self.color = colorizer.ColorDelegator() - self.percolator.insertfilter(self.color) - # Calls color.setdelagate(Delagator(text)). def tearDown(self): self.color.close() - self.percolator.removefilter(self.color) self.text.delete('1.0', 'end') self.color.resetcache() del self.color @@ -134,12 +128,50 @@ def tearDown(self): def test_init(self): color = self.color self.assertIsInstance(color, colorizer.ColorDelegator) - # The following are class variables. + + def test_init_state(self): + # init_state() is called during the instantiation of + # ColorDelegator in setUp(). + color = self.color + self.assertIsNone(color.after_id) self.assertTrue(color.allow_colorizing) self.assertFalse(color.colorizing) + self.assertFalse(color.stop_colorizing) + + +class ColorDelegatorTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + root = cls.root = Tk() + root.withdraw() + text = cls.text = Text(root) + cls.percolator = Percolator(text) + # Delegator stack = [Delegator(text)] + + @classmethod + def tearDownClass(cls): + cls.percolator.redir.close() + del cls.percolator, cls.text + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.color = colorizer.ColorDelegator() + self.percolator.insertfilter(self.color) + # Calls color.setdelegate(Delegator(text)). + + def tearDown(self): + self.color.close() + self.percolator.removefilter(self.color) + self.text.delete('1.0', 'end') + self.color.resetcache() + del self.color def test_setdelegate(self): - # Called in setUp. + # Called in setUp when filter is attached to percolator. color = self.color self.assertIsInstance(color.delegate, colorizer.Delegator) # It is too late to mock notify_range, so test side effect. diff --git a/Misc/NEWS.d/next/IDLE/2019-02-23-17-53-53.bpo-36096.mN5Ly3.rst b/Misc/NEWS.d/next/IDLE/2019-02-23-17-53-53.bpo-36096.mN5Ly3.rst new file mode 100644 index 000000000000..cd6f76e9ac2b --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2019-02-23-17-53-53.bpo-36096.mN5Ly3.rst @@ -0,0 +1 @@ +Refactor class variables to instance variables in colorizer.

1 0

bpo-31904: Add cross-build support for VxWorks RTOS (GH-11968)
by Victor Stinner Feb. 27, 2019

Feb. 27, 2019

https://github.com/python/cpython/commit/32f5fdd7f4213743fe2f6eedd0fe2108f3… commit: 32f5fdd7f4213743fe2f6eedd0fe2108f3157021 branch: master author: pxinwr <peixing.xin(a)windriver.com> committer: Victor Stinner <vstinner(a)redhat.com> date: 2019-02-27T12:09:28+01:00 summary: bpo-31904: Add cross-build support for VxWorks RTOS (GH-11968) files: A Misc/NEWS.d/next/Build/2019-02-21-14-48-31.bpo-31904.J82jY2.rst M Include/osdefs.h M configure M configure.ac M setup.py diff --git a/Include/osdefs.h b/Include/osdefs.h index bd84c1c12c19..3243944a1483 100644 --- a/Include/osdefs.h +++ b/Include/osdefs.h @@ -14,6 +14,10 @@ extern "C" { #define DELIM L';' #endif +#ifdef __VXWORKS__ +#define DELIM L';' +#endif + /* Filename separator */ #ifndef SEP #define SEP L'/' diff --git a/Misc/NEWS.d/next/Build/2019-02-21-14-48-31.bpo-31904.J82jY2.rst b/Misc/NEWS.d/next/Build/2019-02-21-14-48-31.bpo-31904.J82jY2.rst new file mode 100644 index 000000000000..1292193b729c --- /dev/null +++ b/Misc/NEWS.d/next/Build/2019-02-21-14-48-31.bpo-31904.J82jY2.rst @@ -0,0 +1 @@ +Enable build system to cross-build for VxWorks RTOS. diff --git a/configure b/configure index d98d14ab63f3..d0ef8a601b28 100755 --- a/configure +++ b/configure @@ -3268,6 +3268,9 @@ then *-*-cygwin*) ac_sys_system=Cygwin ;; + *-*-vxworks*) + ac_sys_system=VxWorks + ;; *) # for now, limit cross builds to known configurations MACHDEP="unknown" @@ -3312,6 +3315,9 @@ if test "$cross_compiling" = yes; then *-*-cygwin*) _host_cpu= ;; + *-*-vxworks*) + _host_cpu=$host_cpu + ;; *) # for now, limit cross builds to known configurations MACHDEP="unknown" @@ -3399,6 +3405,11 @@ $as_echo "#define _BSD_SOURCE 1" >>confdefs.h QNX/6.3.2) define_xopen_source=no ;; + # On VxWorks, defining _XOPEN_SOURCE causes compile failures + # in network headers still using system V types. + VxWorks/*) + define_xopen_source=no + ;; esac @@ -5283,6 +5294,8 @@ cat >> conftest.c <<EOF i386-gnu #elif defined(__APPLE__) darwin +#elif defined(__VXWORKS__) + vxworks #else # error unknown platform triplet #endif @@ -9391,7 +9404,7 @@ then BLDSHARED="$LDSHARED" fi ;; - Linux*|GNU*|QNX*) + Linux*|GNU*|QNX*|VxWorks*) LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; FreeBSD*) @@ -9472,6 +9485,8 @@ then then CCSHARED="-fPIC" else CCSHARED="-Kpic -belf" fi;; + VxWorks*) + CCSHARED="-fpic -D__SO_PICABILINUX__ -ftls-model=global-dynamic" esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCSHARED" >&5 @@ -9530,6 +9545,8 @@ then # to 2048 kilobytes so that the stack doesn't overflow # when running test_compile.py. LINKFORSHARED='-Wl,-E -N 2048K';; + VxWorks*) + LINKFORSHARED='--export-dynamic';; esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKFORSHARED" >&5 @@ -15079,7 +15096,7 @@ $as_echo "$SOABI" >&6; } case $ac_sys_system in - Linux*|GNU*|Darwin) + Linux*|GNU*|Darwin|VxWorks) EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};; *) EXT_SUFFIX=${SHLIB_SUFFIX};; diff --git a/configure.ac b/configure.ac index c7380caa1964..73ee71c6d249 100644 --- a/configure.ac +++ b/configure.ac @@ -379,6 +379,9 @@ then *-*-cygwin*) ac_sys_system=Cygwin ;; + *-*-vxworks*) + ac_sys_system=VxWorks + ;; *) # for now, limit cross builds to known configurations MACHDEP="unknown" @@ -423,6 +426,9 @@ if test "$cross_compiling" = yes; then *-*-cygwin*) _host_cpu= ;; + *-*-vxworks*) + _host_cpu=$host_cpu + ;; *) # for now, limit cross builds to known configurations MACHDEP="unknown" @@ -507,6 +513,11 @@ case $ac_sys_system/$ac_sys_release in QNX/6.3.2) define_xopen_source=no ;; + # On VxWorks, defining _XOPEN_SOURCE causes compile failures + # in network headers still using system V types. + VxWorks/*) + define_xopen_source=no + ;; esac @@ -829,6 +840,8 @@ cat >> conftest.c <<EOF i386-gnu #elif defined(__APPLE__) darwin +#elif defined(__VXWORKS__) + vxworks #else # error unknown platform triplet #endif @@ -2555,7 +2568,7 @@ then BLDSHARED="$LDSHARED" fi ;; - Linux*|GNU*|QNX*) + Linux*|GNU*|QNX*|VxWorks*) LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; FreeBSD*) @@ -2634,6 +2647,8 @@ then then CCSHARED="-fPIC" else CCSHARED="-Kpic -belf" fi;; + VxWorks*) + CCSHARED="-fpic -D__SO_PICABILINUX__ -ftls-model=global-dynamic" esac fi AC_MSG_RESULT($CCSHARED) @@ -2690,6 +2705,8 @@ then # to 2048 kilobytes so that the stack doesn't overflow # when running test_compile.py. LINKFORSHARED='-Wl,-E -N 2048K';; + VxWorks*) + LINKFORSHARED='--export-dynamic';; esac fi AC_MSG_RESULT($LINKFORSHARED) @@ -4578,7 +4595,7 @@ AC_MSG_RESULT($SOABI) AC_SUBST(EXT_SUFFIX) case $ac_sys_system in - Linux*|GNU*|Darwin) + Linux*|GNU*|Darwin|VxWorks) EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};; *) EXT_SUFFIX=${SHLIB_SUFFIX};; diff --git a/setup.py b/setup.py index 33106549458c..b04208602f3b 100644 --- a/setup.py +++ b/setup.py @@ -44,6 +44,8 @@ def get_platform(): return sys.platform host_platform = get_platform() +VXWORKS = ('vxworks' in host_platform) + # Were we compiled --with-pydebug or with #define Py_DEBUG? COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) @@ -509,13 +511,14 @@ def add_multiarch_paths(self): finally: os.unlink(tmpfile) - def add_gcc_paths(self): - gcc = sysconfig.get_config_var('CC') - tmpfile = os.path.join(self.build_temp, 'gccpaths') + def add_cross_compiling_paths(self): + cc = sysconfig.get_config_var('CC') + tmpfile = os.path.join(self.build_temp, 'ccpaths') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) - ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile)) + ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (cc, tmpfile)) is_gcc = False + is_clang = False in_incdirs = False inc_dirs = [] lib_dirs = [] @@ -525,17 +528,19 @@ def add_gcc_paths(self): for line in fp.readlines(): if line.startswith("gcc version"): is_gcc = True + elif line.startswith("clang version"): + is_clang = True elif line.startswith("#include <...>"): in_incdirs = True elif line.startswith("End of search list"): in_incdirs = False - elif is_gcc and line.startswith("LIBRARY_PATH"): + elif (is_gcc or is_clang) and line.startswith("LIBRARY_PATH"): for d in line.strip().split("=")[1].split(":"): d = os.path.normpath(d) if '/gcc/' not in d: add_dir_to_list(self.compiler.library_dirs, d) - elif is_gcc and in_incdirs and '/gcc/' not in line: + elif (is_gcc or is_clang) and in_incdirs and '/gcc/' not in line and '/clang/' not in line: add_dir_to_list(self.compiler.include_dirs, line.strip()) finally: @@ -550,7 +555,7 @@ def detect_modules(self): add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # only change this for cross builds for 3.3, issues on Mageia if cross_compiling: - self.add_gcc_paths() + self.add_cross_compiling_paths() self.add_multiarch_paths() # Add paths specified in the environment variables LDFLAGS and @@ -722,7 +727,8 @@ def detect_modules(self): # pwd(3) exts.append( Extension('pwd', ['pwdmodule.c']) ) # grp(3) - exts.append( Extension('grp', ['grpmodule.c']) ) + if not VXWORKS: + exts.append( Extension('grp', ['grpmodule.c']) ) # spwd, shadow passwords if (config_h_vars.get('HAVE_GETSPNAM', False) or config_h_vars.get('HAVE_GETSPENT', False)): @@ -859,7 +865,12 @@ def detect_modules(self): libs = ['crypt'] else: libs = [] - exts.append( Extension('_crypt', ['_cryptmodule.c'], libraries=libs) ) + + if not VXWORKS: + exts.append( Extension('_crypt', ['_cryptmodule.c'], libraries=libs) ) + elif self.compiler.find_library_file(lib_dirs, 'OPENSSL'): + libs = ['OPENSSL'] + exts.append( Extension('_crypt', ['_cryptmodule.c'], libraries=libs) ) # CSV files exts.append( Extension('_csv', ['_csv.c']) ) @@ -868,8 +879,14 @@ def detect_modules(self): exts.append( Extension('_posixsubprocess', ['_posixsubprocess.c']) ) # socket(2) - exts.append( Extension('_socket', ['socketmodule.c'], - depends = ['socketmodule.h']) ) + if not VXWORKS: + exts.append( Extension('_socket', ['socketmodule.c'], + depends = ['socketmodule.h']) ) + elif self.compiler.find_library_file(lib_dirs, 'net'): + libs = ['net'] + exts.append( Extension('_socket', ['socketmodule.c'], + depends = ['socketmodule.h'], libraries=libs) ) + # Detect SSL support for the socket module (via _ssl) ssl_ext, hashlib_ext = self._detect_openssl(inc_dirs, lib_dirs) if ssl_ext is not None: @@ -1319,9 +1336,10 @@ class db_found(Exception): pass # Unix-only modules if host_platform != 'win32': - # Steen Lumholt's termios module - exts.append( Extension('termios', ['termios.c']) ) - # Jeremy Hylton's rlimit interface + if not VXWORKS: + # Steen Lumholt's termios module + exts.append( Extension('termios', ['termios.c']) ) + # Jeremy Hylton's rlimit interface exts.append( Extension('resource', ['resource.c']) ) else: missing.extend(['resource', 'termios'])

1 0

bpo-28441: Ensure `.exe` suffix in `sys.executable` on MinGW and Cygwin (GH-4348)
by Inada Naoki Feb. 27, 2019

Feb. 27, 2019

https://github.com/python/cpython/commit/e5897b67badeb04a04e16e29f7650d8331… commit: e5897b67badeb04a04e16e29f7650d833141d67e branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Inada Naoki <methane(a)users.noreply.github.com> date: 2019-02-27T18:24:34+09:00 summary: bpo-28441: Ensure `.exe` suffix in `sys.executable` on MinGW and Cygwin (GH-4348) This is needed to even the run the test suite on buildbots for affected platforms; e.g.: ``` ./python.exe ./Tools/scripts/run_tests.py -j 1 -u all -W --slowest --fail-env-changed --timeout=11700 -j2 /home/embray/src/python/test-worker/3.x.test-worker/build/python -u -W default -bb -E -W error::BytesWarning -m test -r -w -j 1 -u all -W --slowest --fail-env-changed --timeout=11700 -j2 Traceback (most recent call last): File "./Tools/scripts/run_tests.py", line 56, in <module> main(sys.argv[1:]) File "./Tools/scripts/run_tests.py", line 52, in main os.execv(sys.executable, args) PermissionError: [Errno 13] Permission denied make: *** [Makefile:1073: buildbottest] Error 1 ``` (cherry picked from commit 7a7693e9cb12e5571c76331db56a28eef9acb6e0) Co-authored-by: E. M. Bray <erik.m.bray(a)gmail.com> files: A Misc/NEWS.d/next/Library/2018-10-04-15-53-14.bpo-28441.2sQENe.rst M Modules/getpath.c diff --git a/Misc/NEWS.d/next/Library/2018-10-04-15-53-14.bpo-28441.2sQENe.rst b/Misc/NEWS.d/next/Library/2018-10-04-15-53-14.bpo-28441.2sQENe.rst new file mode 100644 index 000000000000..45143c2a54ac --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-10-04-15-53-14.bpo-28441.2sQENe.rst @@ -0,0 +1,3 @@ +On Cygwin and MinGW, ensure that ``sys.executable`` always includes the full +filename in the path, including the ``.exe`` suffix (unless it is a symbolic +link). diff --git a/Modules/getpath.c b/Modules/getpath.c index e6a3e8e78cd3..bfb33316d969 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -296,6 +296,41 @@ absolutize(wchar_t *path) } +#if defined(__CYGWIN__) || defined(__MINGW32__) +/* add_exe_suffix requires that progpath be allocated at least + MAXPATHLEN + 1 bytes. +*/ + +#ifndef EXE_SUFFIX +#define EXE_SUFFIX L".exe" +#endif + +static void +add_exe_suffix(wchar_t *progpath) +{ + /* Check for already have an executable suffix */ + size_t n = wcslen(progpath); + size_t s = wcslen(EXE_SUFFIX); + if (wcsncasecmp(EXE_SUFFIX, progpath+n-s, s) != 0) { + if (n + s > MAXPATHLEN) { + Py_FatalError("progpath overflow in getpath.c's add_exe_suffix()"); + } + /* Save original path for revert */ + wchar_t orig[MAXPATHLEN+1]; + wcsncpy(orig, progpath, MAXPATHLEN); + + wcsncpy(progpath+n, EXE_SUFFIX, s); + progpath[n+s] = '\0'; + + if (!isxfile(progpath)) { + /* Path that added suffix is invalid */ + wcsncpy(progpath, orig, MAXPATHLEN); + } + } +} +#endif + + /* search_for_prefix requires that argv0_path be no more than MAXPATHLEN bytes long. */ @@ -605,6 +640,16 @@ calculate_program_full_path(const _PyCoreConfig *core_config, if (program_full_path[0] != SEP && program_full_path[0] != '\0') { absolutize(program_full_path); } +#if defined(__CYGWIN__) || defined(__MINGW32__) + /* For these platforms it is necessary to ensure that the .exe suffix + * is appended to the filename, otherwise there is potential for + * sys.executable to return the name of a directory under the same + * path (bpo-28441). + */ + if (program_full_path[0] != '\0') { + add_exe_suffix(program_full_path); + } +#endif config->program_full_path = _PyMem_RawWcsdup(program_full_path); if (config->program_full_path == NULL) {

1 0

bpo-36123: Fix test_socket.testWithTimeoutTriggeredSend() race condition (GH-12053)
by Miss Islington (bot) Feb. 26, 2019

Feb. 26, 2019

https://github.com/python/cpython/commit/2632474957fa9c6311af21be6906d12348… commit: 2632474957fa9c6311af21be6906d1234853f288 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-02-26T08:48:52-08:00 summary: bpo-36123: Fix test_socket.testWithTimeoutTriggeredSend() race condition (GH-12053) Use longer timeout for accept() in the server and block on accept in the client. The client now only sets the timeout once the socket is connected. (cherry picked from commit 53b9e1a1c1d86187ad6fbee492b697ef8be74205) Co-authored-by: Joannah Nanjekye <33177550+nanjekyejoannah(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Tests/2019-02-26-12-51-35.bpo-36123.QRhhRS.rst M Lib/test/test_socket.py diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 82b89fcbafa6..381965289615 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -5533,7 +5533,7 @@ def tearDownClass(cls): support.unlink(support.TESTFN) def accept_conn(self): - self.serv.settimeout(self.TIMEOUT) + self.serv.settimeout(MAIN_TIMEOUT) conn, addr = self.serv.accept() conn.settimeout(self.TIMEOUT) self.addCleanup(conn.close) @@ -5718,7 +5718,8 @@ def testWithTimeout(self): def _testWithTimeoutTriggeredSend(self): address = self.serv.getsockname() with open(support.TESTFN, 'rb') as file: - with socket.create_connection(address, timeout=0.01) as sock: + with socket.create_connection(address) as sock: + sock.settimeout(0.01) meth = self.meth_from_sock(sock) self.assertRaises(socket.timeout, meth, file) diff --git a/Misc/NEWS.d/next/Tests/2019-02-26-12-51-35.bpo-36123.QRhhRS.rst b/Misc/NEWS.d/next/Tests/2019-02-26-12-51-35.bpo-36123.QRhhRS.rst new file mode 100644 index 000000000000..5a7e5bb8f43c --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-02-26-12-51-35.bpo-36123.QRhhRS.rst @@ -0,0 +1 @@ +Fix race condition in test_socket. \ No newline at end of file

1 0