Mailman 3 July 2019 - Python-checkins

bpo-37085: Expose SocketCAN bcm_msg_head flags (GH-13646)
by Miss Islington (bot) July 31, 2019

July 31, 2019

https://github.com/python/cpython/commit/d8b914a30b0849476345a19ce0a0ab1ade… commit: d8b914a30b0849476345a19ce0a0ab1ade171b19 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-31T02:10:38-07:00 summary: bpo-37085: Expose SocketCAN bcm_msg_head flags (GH-13646) Expose the CAN_BCM SocketCAN constants used in the bcm_msg_head struct flags (provided by <linux/can/bcm.h>) under the … [View More]socket library. This adds the following constants with a CAN_BCM prefix: * SETTIMER * STARTTIMER * TX_COUNTEVT * TX_ANNOUNCE * TX_CP_CAN_ID * RX_FILTER_ID * RX_CHECK_DLC * RX_NO_AUTOTIMER * RX_ANNOUNCE_RESUME * TX_RESET_MULTI_IDX * RX_RTR_FRAME * CAN_FD_FRAME The CAN_FD_FRAME flag was introduced in the 4.8 kernel, while the other ones were present since SocketCAN drivers were mainlined in 2.6.25. As such, it is probably unnecessary to guard against these constants being missing. (cherry picked from commit 31c4fd2a10d90beaa37d630e5f74a471e14e089d) Co-authored-by: karl ding <karlding(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2019-06-18-16-29-31.bpo-37085.GeYaD6.rst M Doc/library/socket.rst M Lib/test/test_socket.py M Misc/ACKS M Modules/socketmodule.c diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index f1010fb35a47..12416e0f4a9f 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -374,6 +374,9 @@ Constants .. availability:: Linux >= 2.6.25. + .. note:: + The :data:`CAN_BCM_CAN_FD_FRAME` flag is only available on Linux >= 4.8. + .. versionadded:: 3.4 .. data:: CAN_RAW_FD_FRAMES diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index db525642d6af..c472be135e39 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1872,6 +1872,19 @@ def testBCMConstants(self): socket.CAN_BCM_RX_TIMEOUT # cyclic message is absent socket.CAN_BCM_RX_CHANGED # updated CAN frame (detected content change) + # flags + socket.CAN_BCM_SETTIMER + socket.CAN_BCM_STARTTIMER + socket.CAN_BCM_TX_COUNTEVT + socket.CAN_BCM_TX_ANNOUNCE + socket.CAN_BCM_TX_CP_CAN_ID + socket.CAN_BCM_RX_FILTER_ID + socket.CAN_BCM_RX_CHECK_DLC + socket.CAN_BCM_RX_NO_AUTOTIMER + socket.CAN_BCM_RX_ANNOUNCE_RESUME + socket.CAN_BCM_TX_RESET_MULTI_IDX + socket.CAN_BCM_RX_RTR_FRAME + def testCreateSocket(self): with socket.socket(socket.PF_CAN, socket.SOCK_RAW, socket.CAN_RAW) as s: pass diff --git a/Misc/ACKS b/Misc/ACKS index a4973a89d414..829aa796c847 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -395,6 +395,7 @@ Alon Diamant Toby Dickenson Mark Dickinson Jack Diederich +Karl Ding Daniel Diniz Humberto Diogenes Yves Dionne diff --git a/Misc/NEWS.d/next/Library/2019-06-18-16-29-31.bpo-37085.GeYaD6.rst b/Misc/NEWS.d/next/Library/2019-06-18-16-29-31.bpo-37085.GeYaD6.rst new file mode 100644 index 000000000000..e8db521d7aba --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-06-18-16-29-31.bpo-37085.GeYaD6.rst @@ -0,0 +1,2 @@ +Add the optional Linux SocketCAN Broadcast Manager constants, used as flags +to configure the BCM behaviour, in the socket module. Patch by Karl Ding. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 36d13e768cd3..0470f387e3bc 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -7656,6 +7656,8 @@ PyInit__socket(void) #endif #ifdef HAVE_LINUX_CAN_BCM_H PyModule_AddIntMacro(m, CAN_BCM); + + /* BCM opcodes */ PyModule_AddIntConstant(m, "CAN_BCM_TX_SETUP", TX_SETUP); PyModule_AddIntConstant(m, "CAN_BCM_TX_DELETE", TX_DELETE); PyModule_AddIntConstant(m, "CAN_BCM_TX_READ", TX_READ); @@ -7668,6 +7670,23 @@ PyInit__socket(void) PyModule_AddIntConstant(m, "CAN_BCM_RX_STATUS", RX_STATUS); PyModule_AddIntConstant(m, "CAN_BCM_RX_TIMEOUT", RX_TIMEOUT); PyModule_AddIntConstant(m, "CAN_BCM_RX_CHANGED", RX_CHANGED); + + /* BCM flags */ + PyModule_AddIntConstant(m, "CAN_BCM_SETTIMER", SETTIMER); + PyModule_AddIntConstant(m, "CAN_BCM_STARTTIMER", STARTTIMER); + PyModule_AddIntConstant(m, "CAN_BCM_TX_COUNTEVT", TX_COUNTEVT); + PyModule_AddIntConstant(m, "CAN_BCM_TX_ANNOUNCE", TX_ANNOUNCE); + PyModule_AddIntConstant(m, "CAN_BCM_TX_CP_CAN_ID", TX_CP_CAN_ID); + PyModule_AddIntConstant(m, "CAN_BCM_RX_FILTER_ID", RX_FILTER_ID); + PyModule_AddIntConstant(m, "CAN_BCM_RX_CHECK_DLC", RX_CHECK_DLC); + PyModule_AddIntConstant(m, "CAN_BCM_RX_NO_AUTOTIMER", RX_NO_AUTOTIMER); + PyModule_AddIntConstant(m, "CAN_BCM_RX_ANNOUNCE_RESUME", RX_ANNOUNCE_RESUME); + PyModule_AddIntConstant(m, "CAN_BCM_TX_RESET_MULTI_IDX", TX_RESET_MULTI_IDX); + PyModule_AddIntConstant(m, "CAN_BCM_RX_RTR_FRAME", RX_RTR_FRAME); +#ifdef CAN_FD_FRAME + /* CAN_FD_FRAME was only introduced in the 4.8.x kernel series */ + PyModule_AddIntConstant(m, "CAN_BCM_CAN_FD_FRAME", CAN_FD_FRAME); +#endif #endif #ifdef SOL_RDS PyModule_AddIntMacro(m, SOL_RDS); [View Less]

1 0

(no subject)
by Łukasz Langa July 31, 2019

July 31, 2019

To: python-checkins(a)python.org Subject: bpo-37085: Expose SocketCAN bcm_msg_head flags (#13646) Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 https://github.com/python/cpython/commit/31c4fd2a10d90beaa37d630e5f74a471e1… 089d commit: 31c4fd2a10d90beaa37d630e5f74a471e14e089d branch: master author: karl ding <karlding(a)users.noreply.github.com> committer: =C5=81ukasz Langa <lukasz(a)langa.pl> date: 2019-07-31T10:47:16+02:00 … [View More]summary: bpo-37085: Expose SocketCAN bcm_msg_head flags (#13646) Expose the CAN_BCM SocketCAN constants used in the bcm_msg_head struct flags (provided by <linux/can/bcm.h>) under the socket library. This adds the following constants with a CAN_BCM prefix: * SETTIMER * STARTTIMER * TX_COUNTEVT * TX_ANNOUNCE * TX_CP_CAN_ID * RX_FILTER_ID * RX_CHECK_DLC * RX_NO_AUTOTIMER * RX_ANNOUNCE_RESUME * TX_RESET_MULTI_IDX * RX_RTR_FRAME * CAN_FD_FRAME The CAN_FD_FRAME flag was introduced in the 4.8 kernel, while the other ones were present since SocketCAN drivers were mainlined in 2.6.25. As such, it is probably unnecessary to guard against these constants being missing. files: A Misc/NEWS.d/next/Library/2019-06-18-16-29-31.bpo-37085.GeYaD6.rst M Doc/library/socket.rst M Lib/test/test_socket.py M Misc/ACKS M Modules/socketmodule.c diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index e3ddebdcbc0c..eebbe810abe4 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -391,6 +391,9 @@ Constants =20 .. availability:: Linux >=3D 2.6.25. =20 + .. note:: + The :data:`CAN_BCM_CAN_FD_FRAME` flag is only available on Linux >=3D = 4.8. + .. versionadded:: 3.4 =20 .. data:: CAN_RAW_FD_FRAMES diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 2705eff4794e..11b2a38ad76d 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1908,6 +1908,19 @@ def testBCMConstants(self): socket.CAN_BCM_RX_TIMEOUT # cyclic message is absent socket.CAN_BCM_RX_CHANGED # updated CAN frame (detected content ch= ange) =20 + # flags + socket.CAN_BCM_SETTIMER + socket.CAN_BCM_STARTTIMER + socket.CAN_BCM_TX_COUNTEVT + socket.CAN_BCM_TX_ANNOUNCE + socket.CAN_BCM_TX_CP_CAN_ID + socket.CAN_BCM_RX_FILTER_ID + socket.CAN_BCM_RX_CHECK_DLC + socket.CAN_BCM_RX_NO_AUTOTIMER + socket.CAN_BCM_RX_ANNOUNCE_RESUME + socket.CAN_BCM_TX_RESET_MULTI_IDX + socket.CAN_BCM_RX_RTR_FRAME + def testCreateSocket(self): with socket.socket(socket.PF_CAN, socket.SOCK_RAW, socket.CAN_RAW) a= s s: pass diff --git a/Misc/ACKS b/Misc/ACKS index e02e8e1fa515..9ff74ec0cca1 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -397,6 +397,7 @@ Alon Diamant Toby Dickenson Mark Dickinson Jack Diederich +Karl Ding Daniel Diniz Humberto Diogenes Yves Dionne diff --git a/Misc/NEWS.d/next/Library/2019-06-18-16-29-31.bpo-37085.GeYaD6.rs= t b/Misc/NEWS.d/next/Library/2019-06-18-16-29-31.bpo-37085.GeYaD6.rst new file mode 100644 index 000000000000..e8db521d7aba --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-06-18-16-29-31.bpo-37085.GeYaD6.rst @@ -0,0 +1,2 @@ +Add the optional Linux SocketCAN Broadcast Manager constants, used as flags +to configure the BCM behaviour, in the socket module. Patch by Karl Ding. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 73e64f235a6f..99e350b4333b 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -7656,6 +7656,8 @@ PyInit__socket(void) #endif #ifdef HAVE_LINUX_CAN_BCM_H PyModule_AddIntMacro(m, CAN_BCM); + + /* BCM opcodes */ PyModule_AddIntConstant(m, "CAN_BCM_TX_SETUP", TX_SETUP); PyModule_AddIntConstant(m, "CAN_BCM_TX_DELETE", TX_DELETE); PyModule_AddIntConstant(m, "CAN_BCM_TX_READ", TX_READ); @@ -7668,6 +7670,23 @@ PyInit__socket(void) PyModule_AddIntConstant(m, "CAN_BCM_RX_STATUS", RX_STATUS); PyModule_AddIntConstant(m, "CAN_BCM_RX_TIMEOUT", RX_TIMEOUT); PyModule_AddIntConstant(m, "CAN_BCM_RX_CHANGED", RX_CHANGED); + + /* BCM flags */ + PyModule_AddIntConstant(m, "CAN_BCM_SETTIMER", SETTIMER); + PyModule_AddIntConstant(m, "CAN_BCM_STARTTIMER", STARTTIMER); + PyModule_AddIntConstant(m, "CAN_BCM_TX_COUNTEVT", TX_COUNTEVT); + PyModule_AddIntConstant(m, "CAN_BCM_TX_ANNOUNCE", TX_ANNOUNCE); + PyModule_AddIntConstant(m, "CAN_BCM_TX_CP_CAN_ID", TX_CP_CAN_ID); + PyModule_AddIntConstant(m, "CAN_BCM_RX_FILTER_ID", RX_FILTER_ID); + PyModule_AddIntConstant(m, "CAN_BCM_RX_CHECK_DLC", RX_CHECK_DLC); + PyModule_AddIntConstant(m, "CAN_BCM_RX_NO_AUTOTIMER", RX_NO_AUTOTIMER); + PyModule_AddIntConstant(m, "CAN_BCM_RX_ANNOUNCE_RESUME", RX_ANNOUNCE_RES= UME); + PyModule_AddIntConstant(m, "CAN_BCM_TX_RESET_MULTI_IDX", TX_RESET_MULTI_= IDX); + PyModule_AddIntConstant(m, "CAN_BCM_RX_RTR_FRAME", RX_RTR_FRAME); +#ifdef CAN_FD_FRAME + /* CAN_FD_FRAME was only introduced in the 4.8.x kernel series */ + PyModule_AddIntConstant(m, "CAN_BCM_CAN_FD_FRAME", CAN_FD_FRAME); +#endif #endif #ifdef SOL_RDS PyModule_AddIntMacro(m, SOL_RDS); [View Less]

1 0

Refined Qt GUI example in the logging cookbook. (GH-15045) (GH-15046)
by Vinay Sajip July 31, 2019

July 31, 2019

https://github.com/python/cpython/commit/9b9cac4e5de975fe2417d8231822bc1d2c… commit: 9b9cac4e5de975fe2417d8231822bc1d2ca2d273 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: 2019-07-31T07:58:46+01:00 summary: Refined Qt GUI example in the logging cookbook. (GH-15045) (GH-15046) (cherry picked from commit 472eced6770c2fabab3031e4e16cd32e32b8a0cc) files: M Doc/howto/logging-… [View More]cookbook.rst diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst index ef9ad447f801..9f52780af4fc 100644 --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -2760,8 +2760,8 @@ The following example shows how to log to a Qt GUI. This introduces a simple ``QtHandler`` class which takes a callable, which should be a slot in the main thread that does GUI updates. A worker thread is also created to show how you can log to the GUI from both the UI itself (via a button for manual logging) -as well as a worker thread doing work in the background (here, just random -short delays). +as well as a worker thread doing work in the background (here, just logging +messages at random levels with random short delays in between). The worker thread is implemented using Qt's ``QThread`` class rather than the :mod:`threading` module, as there are circumstances where one has to use @@ -2769,7 +2769,7 @@ The worker thread is implemented using Qt's ``QThread`` class rather than the The code should work with recent releases of either ``PySide2`` or ``PyQt5``. You should be able to adapt the approach to earlier versions of Qt. Please -refer to the comments in the code for more detailed information. +refer to the comments in the code snippet for more detailed information. .. code-block:: python3 @@ -2789,22 +2789,24 @@ refer to the comments in the code for more detailed information. Signal = QtCore.pyqtSignal Slot = QtCore.pyqtSlot + logger = logging.getLogger(__name__) + # # Signals need to be contained in a QObject or subclass in order to be correctly # initialized. # class Signaller(QtCore.QObject): - signal = Signal(str) + signal = Signal(str, logging.LogRecord) # # Output to a Qt GUI is only supposed to happen on the main thread. So, this # handler is designed to take a slot function which is set up to run in the main - # thread. In this example, the function takes a single argument which is a - # formatted log message. You can attach a formatter instance which formats a - # LogRecord however you like, or change the slot function to take some other - # value derived from the LogRecord. + # thread. In this example, the function takes a string argument which is a + # formatted log message, and the log record which generated it. The formatted + # string is just a convenience - you could format a string for output any way + # you like in the slot function itself. # # You specify the slot function to do whatever GUI updates you want. The handler # doesn't know or care about specific UI elements. @@ -2817,7 +2819,7 @@ refer to the comments in the code for more detailed information. def emit(self, record): s = self.format(record) - self.signaller.signal.emit(s) + self.signaller.signal.emit(s, record) # # This example uses QThreads, which means that the threads at the Python level @@ -2827,6 +2829,13 @@ refer to the comments in the code for more detailed information. def ctname(): return QtCore.QThread.currentThread().objectName() + + # + # Used to generate random levels for logging. + # + LEVELS = (logging.DEBUG, logging.INFO, logging.WARNING, logging.ERROR, + logging.CRITICAL) + # # This worker class represents work that is done in a thread separate to the # main thread. The way the thread is kicked off to do work is via a button press @@ -2851,7 +2860,8 @@ refer to the comments in the code for more detailed information. while not QtCore.QThread.currentThread().isInterruptionRequested(): delay = 0.5 + random.random() * 2 time.sleep(delay) - logger.debug('Message after delay of %3.1f: %d', delay, i, extra=extra) + level = random.choice(LEVELS) + logger.log(level, 'Message after delay of %3.1f: %d', delay, i, extra=extra) i += 1 # @@ -2864,10 +2874,18 @@ refer to the comments in the code for more detailed information. # class Window(QtWidgets.QWidget): + COLORS = { + logging.DEBUG: 'black', + logging.INFO: 'blue', + logging.WARNING: 'orange', + logging.ERROR: 'red', + logging.CRITICAL: 'purple', + } + def __init__(self, app): super(Window, self).__init__() self.app = app - self.textedit = te = QtWidgets.QTextEdit(self) + self.textedit = te = QtWidgets.QPlainTextEdit(self) # Set whatever the default monospace font is for the platform f = QtGui.QFont('nosuchfont') f.setStyleHint(f.Monospace) @@ -2880,7 +2898,7 @@ refer to the comments in the code for more detailed information. self.handler = h = QtHandler(self.update_status) # Remember to use qThreadName rather than threadName in the format string. fs = '%(asctime)s %(qThreadName)-12s %(levelname)-8s %(message)s' - formatter = logging.Formatter(f) + formatter = logging.Formatter(fs) h.setFormatter(formatter) logger.addHandler(h) # Set up to terminate the QThread when we exit @@ -2932,14 +2950,17 @@ refer to the comments in the code for more detailed information. # that's where the slots are set up @Slot(str) - def update_status(self, status): - self.textedit.append(status) + def update_status(self, status, record): + color = self.COLORS.get(record.levelno, 'black') + s = '<pre><font color="%s">%s</font></pre>' % (color, status) + self.textedit.appendHtml(s) @Slot() def manual_update(self): - levels = (logging.DEBUG, logging.INFO, logging.WARNING, logging.ERROR, - logging.CRITICAL) - level = random.choice(levels) + # This function uses the formatted message passed in, but also uses + # information from the record to format the message in an appropriate + # color according to its severity (level). + level = random.choice(LEVELS) extra = {'qThreadName': ctname() } logger.log(level, 'Manually logged!', extra=extra) @@ -2947,6 +2968,7 @@ refer to the comments in the code for more detailed information. def clear_display(self): self.textedit.clear() + def main(): QtCore.QThread.currentThread().setObjectName('MainThread') logging.getLogger().setLevel(logging.DEBUG) [View Less]

1 0

Refined Qt GUI example in the logging cookbook. (GH-15045)
by Vinay Sajip July 31, 2019

July 31, 2019

https://github.com/python/cpython/commit/472eced6770c2fabab3031e4e16cd32e32… commit: 472eced6770c2fabab3031e4e16cd32e32b8a0cc branch: master author: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> committer: GitHub <noreply(a)github.com> date: 2019-07-31T07:36:45+01:00 summary: Refined Qt GUI example in the logging cookbook. (GH-15045) files: M Doc/howto/logging-cookbook.rst diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst index ef9ad447f801..9f52780af4fc … [View More]100644 --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -2760,8 +2760,8 @@ The following example shows how to log to a Qt GUI. This introduces a simple ``QtHandler`` class which takes a callable, which should be a slot in the main thread that does GUI updates. A worker thread is also created to show how you can log to the GUI from both the UI itself (via a button for manual logging) -as well as a worker thread doing work in the background (here, just random -short delays). +as well as a worker thread doing work in the background (here, just logging +messages at random levels with random short delays in between). The worker thread is implemented using Qt's ``QThread`` class rather than the :mod:`threading` module, as there are circumstances where one has to use @@ -2769,7 +2769,7 @@ The worker thread is implemented using Qt's ``QThread`` class rather than the The code should work with recent releases of either ``PySide2`` or ``PyQt5``. You should be able to adapt the approach to earlier versions of Qt. Please -refer to the comments in the code for more detailed information. +refer to the comments in the code snippet for more detailed information. .. code-block:: python3 @@ -2789,22 +2789,24 @@ refer to the comments in the code for more detailed information. Signal = QtCore.pyqtSignal Slot = QtCore.pyqtSlot + logger = logging.getLogger(__name__) + # # Signals need to be contained in a QObject or subclass in order to be correctly # initialized. # class Signaller(QtCore.QObject): - signal = Signal(str) + signal = Signal(str, logging.LogRecord) # # Output to a Qt GUI is only supposed to happen on the main thread. So, this # handler is designed to take a slot function which is set up to run in the main - # thread. In this example, the function takes a single argument which is a - # formatted log message. You can attach a formatter instance which formats a - # LogRecord however you like, or change the slot function to take some other - # value derived from the LogRecord. + # thread. In this example, the function takes a string argument which is a + # formatted log message, and the log record which generated it. The formatted + # string is just a convenience - you could format a string for output any way + # you like in the slot function itself. # # You specify the slot function to do whatever GUI updates you want. The handler # doesn't know or care about specific UI elements. @@ -2817,7 +2819,7 @@ refer to the comments in the code for more detailed information. def emit(self, record): s = self.format(record) - self.signaller.signal.emit(s) + self.signaller.signal.emit(s, record) # # This example uses QThreads, which means that the threads at the Python level @@ -2827,6 +2829,13 @@ refer to the comments in the code for more detailed information. def ctname(): return QtCore.QThread.currentThread().objectName() + + # + # Used to generate random levels for logging. + # + LEVELS = (logging.DEBUG, logging.INFO, logging.WARNING, logging.ERROR, + logging.CRITICAL) + # # This worker class represents work that is done in a thread separate to the # main thread. The way the thread is kicked off to do work is via a button press @@ -2851,7 +2860,8 @@ refer to the comments in the code for more detailed information. while not QtCore.QThread.currentThread().isInterruptionRequested(): delay = 0.5 + random.random() * 2 time.sleep(delay) - logger.debug('Message after delay of %3.1f: %d', delay, i, extra=extra) + level = random.choice(LEVELS) + logger.log(level, 'Message after delay of %3.1f: %d', delay, i, extra=extra) i += 1 # @@ -2864,10 +2874,18 @@ refer to the comments in the code for more detailed information. # class Window(QtWidgets.QWidget): + COLORS = { + logging.DEBUG: 'black', + logging.INFO: 'blue', + logging.WARNING: 'orange', + logging.ERROR: 'red', + logging.CRITICAL: 'purple', + } + def __init__(self, app): super(Window, self).__init__() self.app = app - self.textedit = te = QtWidgets.QTextEdit(self) + self.textedit = te = QtWidgets.QPlainTextEdit(self) # Set whatever the default monospace font is for the platform f = QtGui.QFont('nosuchfont') f.setStyleHint(f.Monospace) @@ -2880,7 +2898,7 @@ refer to the comments in the code for more detailed information. self.handler = h = QtHandler(self.update_status) # Remember to use qThreadName rather than threadName in the format string. fs = '%(asctime)s %(qThreadName)-12s %(levelname)-8s %(message)s' - formatter = logging.Formatter(f) + formatter = logging.Formatter(fs) h.setFormatter(formatter) logger.addHandler(h) # Set up to terminate the QThread when we exit @@ -2932,14 +2950,17 @@ refer to the comments in the code for more detailed information. # that's where the slots are set up @Slot(str) - def update_status(self, status): - self.textedit.append(status) + def update_status(self, status, record): + color = self.COLORS.get(record.levelno, 'black') + s = '<pre><font color="%s">%s</font></pre>' % (color, status) + self.textedit.appendHtml(s) @Slot() def manual_update(self): - levels = (logging.DEBUG, logging.INFO, logging.WARNING, logging.ERROR, - logging.CRITICAL) - level = random.choice(levels) + # This function uses the formatted message passed in, but also uses + # information from the record to format the message in an appropriate + # color according to its severity (level). + level = random.choice(LEVELS) extra = {'qThreadName': ctname() } logger.log(level, 'Manually logged!', extra=extra) @@ -2947,6 +2968,7 @@ refer to the comments in the code for more detailed information. def clear_display(self): self.textedit.clear() + def main(): QtCore.QThread.currentThread().setObjectName('MainThread') logging.getLogger().setLevel(logging.DEBUG) [View Less]

1 0

IDLE: changelog correction and addition (GH-15042)
by Miss Islington (bot) July 31, 2019

July 31, 2019

https://github.com/python/cpython/commit/8194a2050dcc11cca40a619a7bafcc0abf… commit: 8194a2050dcc11cca40a619a7bafcc0abf23bc4e branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-30T22:42:17-07:00 summary: IDLE: changelog correction and addition (GH-15042) (cherry picked from commit d04f8907baaa6620be7347ba14dd84bc4ef33814) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> … [View More]

1 0

IDLE: changelog correction and addition (GH-15042)
by Terry Jan Reedy July 31, 2019

July 31, 2019

https://github.com/python/cpython/commit/d04f8907baaa6620be7347ba14dd84bc4e… commit: d04f8907baaa6620be7347ba14dd84bc4ef33814 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2019-07-31T01:35:30-04:00 summary: IDLE: changelog correction and addition (GH-15042) files: M Misc/NEWS.d/3.8.0a3.rst M Misc/NEWS.d/3.8.0b1.rst diff --git a/Misc/NEWS.d/3.8.0a3.rst b/Misc/NEWS.d/3.8.0a3.rst index fc37b22ddb19..66308c6bca2e 100644 --- … [View More]

1 0

bpo-33821: Update IDLE section of What's New 3.7 (GH-15036)
by Miss Islington (bot) July 31, 2019

July 31, 2019

https://github.com/python/cpython/commit/8c6e35d2d21928d3e611c39399099e6953… commit: 8c6e35d2d21928d3e611c39399099e69532952a9 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-30T22:24:43-07:00 summary: bpo-33821: Update IDLE section of What's New 3.7 (GH-15036) * bpo-33821: Update IDLE section of What's New 3.7 * Fix roles. (cherry picked from commit … [View More]

1 0

bpo-33821: Update IDLE section of What's New 3.7 (GH-15036)
by Miss Islington (bot) July 31, 2019

July 31, 2019

https://github.com/python/cpython/commit/9e044ddefd5e02cf0ffac52bcbae6a21a6… commit: 9e044ddefd5e02cf0ffac52bcbae6a21a677d257 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-30T22:23:05-07:00 summary: bpo-33821: Update IDLE section of What's New 3.7 (GH-15036) * bpo-33821: Update IDLE section of What's New 3.7 * Fix roles. (cherry picked from commit … [View More]

1 0

bpo-34162: Add missing items to idlelib/NEWS.txt. (GH-15034)
by Miss Islington (bot) July 31, 2019

July 31, 2019

https://github.com/python/cpython/commit/ac7cb7b9beaf907a4a484991e467913813… commit: ac7cb7b9beaf907a4a484991e467913813bb4971 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-30T22:21:14-07:00 summary: bpo-34162: Add missing items to idlelib/NEWS.txt. (GH-15034) (cherry picked from commit fff5cb21ae270d8572741e18030765580c7ae361) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.… [View More]

1 0

bpo-34162: Add missing items to idlelib/NEWS.txt. (GH-15034)
by Miss Islington (bot) July 31, 2019

July 31, 2019

https://github.com/python/cpython/commit/34de5dcf218badfece4ef78587733bbb90… commit: 34de5dcf218badfece4ef78587733bbb903ab7b9 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-30T22:19:28-07:00 summary: bpo-34162: Add missing items to idlelib/NEWS.txt. (GH-15034) (cherry picked from commit fff5cb21ae270d8572741e18030765580c7ae361) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.… [View More]

1 0