Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into supermon
* main:
  gh-91896: Fixup some docs issues following ByteString deprecation (#104422)
  GH-104371: check return value of calling `mv.release` (#104417)
  gh-104415: Fix refleak tests for `typing.ByteString` deprecation (#104416)
  GH-86275: Implementation of hypothesis stubs for property-based tests, with zoneinfo tests (#22863)
  GH-103082: Filter LINE events in VM, to simplify tool implementation. (GH-104387)
  gh-93649: Split gc- and allocation tests from _testcapimodule.c (GH-104403)
  gh-104389: Add 'unused' keyword to Argument Clinic C converters (#104390)
  gh-101819: Prepare _io._IOBase for module state (#104386)
  gh-104413: Fix refleak when super attribute throws AttributeError (#104414)
  Fix refleak in `super_descr_get` (#104408)
  gh-87526: Remove dead initialization from _zoneinfo parse_abbr() (#24700)
  gh-91896: Improve visibility of `ByteString` deprecation warnings (#104294)
  gh-104371: Fix calls to `__release_buffer__` while an exception is active (#104378)
  gh-104377: fix cell in comprehension that is free in outer scope (#104394)
  gh-104392: Remove _paramspec_tvars from typing (#104393)
  gh-104396: uuid.py to skip platform check for emscripten and wasi (gh-104397)
  gh-99108: Refresh HACL* from upstream (#104401)
  gh-104301: Allow leading whitespace in disambiguated pdb statements (#104342)
  • Loading branch information
carljm committed May 12, 2023
commit 8efd7c6f17e0faeca8fe6337a9eeca472d74b0ba
2 changes: 1 addition & 1 deletion Lib/test/test_monitoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ def test_lines_loop(self):
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
start = LineMonitoringTest.test_lines_loop.__code__.co_firstlineno
self.assertEqual(events, [start+7, 22, 23, 23, 22, start+8])
self.assertEqual(events, [start+7, 22, 23, 22, 23, 22, start+8])
finally:
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.