Attachment #427575 for bug #225311

View Details Raw Unified Return to Bug 225311

| Differences between



2021-05-03  Jonathan Bedard  <jbedard@apple.com>

        [webkitcorepy] Pass logging level to child processes
        https://bugs.webkit.org/show_bug.cgi?id=225311
        <rdar://problem/77457646>

        Reviewed by Stephanie Lewis.

        * Scripts/libraries/webkitcorepy/setup.py: Bump version.
        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
        * Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py:
        (Process.main): Set root logging level.
        (TaskPool.__init__): Pass logging level to child process.

2021-05-03  Chris Dumez  <cdumez@apple.com>

        Restore pre-r276879 behavior for FileSystem::deleteFile() and FileSystem::deleteEmptyDirectory()

Lines 30-36 def readme(): Tools/Scripts/libraries/webkitcorepy/setup.py_sec1
- Tools/Scripts/libraries/webkitcorepy/setup.py -1 / +1 lines
30		30
31	setup(	31	setup(
32	name='webkitcorepy',	32	name='webkitcorepy',
33	version='0.5.11',	33	version='0.5.12',
34	description='Library containing various Python support classes and functions.',	34	description='Library containing various Python support classes and functions.',
35	long_description=readme(),	35	long_description=readme(),
36	classifiers=[	36	classifiers=[

Lines 37-43 from webkitcorepy.output_capture import Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py_sec1
- Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py -1 / +1 lines
37	from webkitcorepy.task_pool import TaskPool	37	from webkitcorepy.task_pool import TaskPool
38	from webkitcorepy.credentials import credentials	38	from webkitcorepy.credentials import credentials
39		39
40	version = Version(0, 5, 11)	40	version = Version(0, 5, 12)
41		41
42	from webkitcorepy.autoinstall import Package, AutoInstall	42	from webkitcorepy.autoinstall import Package, AutoInstall
43	if sys.version_info > (3, 0):	43	if sys.version_info > (3, 0):



            cls.working = False

    @classmethod
    def main(cls, name, loglevel, setup, setupargs, setupkwargs, queue, teardown, teardownargs, teardownkwargs):
        from tblib import pickling_support

        cls.name = name

        for handler in logger.handlers:
            logger.removeHandler(handler)
        logger.addHandler(cls.LogHandler(queue))
        logger.setLevel(loglevel)

        queue.send(State(State.STARTING))


        self.workers = [multiprocessing.Process(
            target=Process.main,
            args=(
                '{}/{}'.format(name, count), logging.getLogger().getEffectiveLevel(),
                setup, setupargs, setupkwargs,
                BiDirectionalQueue(outgoing=self.queue.incoming, incoming=self.queue.outgoing),
                teardown, teardownargs, teardownkwargs,

Return to Bug 225311

Lines 231-237 class Process(object): Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py_sec1
- Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py -2 / +3 lines
231	cls.working = False	231	cls.working = False
232		232
233	@classmethod	233	@classmethod
234	def main(cls, name, setup, setupargs, setupkwargs, queue, teardown, teardownargs, teardownkwargs):	234	def main(cls, name, loglevel, setup, setupargs, setupkwargs, queue, teardown, teardownargs, teardownkwargs):
235	from tblib import pickling_support	235	from tblib import pickling_support
236		236
237	cls.name = name	237	cls.name = name
Lines 250-255 class Process(object): Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py_sec2
250	for handler in logger.handlers:	250	for handler in logger.handlers:
251	logger.removeHandler(handler)	251	logger.removeHandler(handler)
252	logger.addHandler(cls.LogHandler(queue))	252	logger.addHandler(cls.LogHandler(queue))
		253	logger.setLevel(loglevel)
253		254
254	queue.send(State(State.STARTING))	255	queue.send(State(State.STARTING))
255		256
Lines 304-310 class TaskPool(object): Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py_sec3
304	self.workers = [multiprocessing.Process(	305	self.workers = [multiprocessing.Process(
305	target=Process.main,	306	target=Process.main,
306	args=(	307	args=(
307	'{}/{}'.format(name, count),	308	'{}/{}'.format(name, count), logging.getLogger().getEffectiveLevel(),
308	setup, setupargs, setupkwargs,	309	setup, setupargs, setupkwargs,
309	BiDirectionalQueue(outgoing=self.queue.incoming, incoming=self.queue.outgoing),	310	BiDirectionalQueue(outgoing=self.queue.incoming, incoming=self.queue.outgoing),
310	teardown, teardownargs, teardownkwargs,	311	teardown, teardownargs, teardownkwargs,

Lines 1-3 Tools/ChangeLog_sec1
- Tools/ChangeLog +14 lines
		1	2021-05-03 Jonathan Bedard <jbedard@apple.com>
		2
		3	[webkitcorepy] Pass logging level to child processes
		4	https://bugs.webkit.org/show_bug.cgi?id=225311
		5	<rdar://problem/77457646>
		6
		7	Reviewed by Stephanie Lewis.
		8
		9	* Scripts/libraries/webkitcorepy/setup.py: Bump version.
		10	* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
		11	* Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py:
		12	(Process.main): Set root logging level.
		13	(TaskPool.__init__): Pass logging level to child process.
		14
1	2021-05-03 Chris Dumez <cdumez@apple.com>	15	2021-05-03 Chris Dumez <cdumez@apple.com>
2		16
3	Restore pre-r276879 behavior for FileSystem::deleteFile() and FileSystem::deleteEmptyDirectory()	17	Restore pre-r276879 behavior for FileSystem::deleteFile() and FileSystem::deleteEmptyDirectory()