Skip to content

Commit 40a471e

Browse files
authored
Fix matplotlib backend computation (#1811)
* Fix matplotlib backend computation and problem found with just my code fix * Remove extra logging
1 parent d266361 commit 40a471e

File tree

6 files changed

+112
-127
lines changed

6 files changed

+112
-127
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ If you have an existing test failing, you can investigate it by running the test
201201
- Clone the repo a second time
202202
- Change the code in `tests_python/debugger_unittest.py` so that the test prints out logs on success too (by default it only logs the output on a failure)
203203
- Run the failing test in the second clone
204-
- Run the failing test in your original clone
204+
- Run the failing test in your original clone (with the --capture=tee-sys so that it outputs the log)
205205
- Diff the results by finding the log file name in the output and diffing those two files
206206
- Add more logging around where the differences first appear
207207
- Repeat running and diffing

src/debugpy/_vendored/pydevd/_pydevd_sys_monitoring/_pydevd_sys_monitoring.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -624,10 +624,10 @@ def _get_func_code_info(code_obj, frame_or_depth) -> FuncCodeInfo:
624624
frame = frame_or_depth
625625
assert frame.f_code is code_obj
626626

627-
func_code_info.filtered_out_force_checked = py_db.apply_files_filter(frame, func_code_info.abs_path_filename, py_db.get_use_libraries_filter())
627+
func_code_info.filtered_out_force_checked = py_db.apply_files_filter(frame, func_code_info.abs_path_filename, True)
628628

629629
if py_db.is_files_filter_enabled:
630-
func_code_info.always_filtered_out = func_code_info.filtered_out_force_checked
630+
func_code_info.always_filtered_out = py_db.apply_files_filter(frame, func_code_info.abs_path_filename, False)
631631
if func_code_info.always_filtered_out:
632632
_code_to_func_code_info_cache[code_obj] = func_code_info
633633
return func_code_info
@@ -1163,7 +1163,7 @@ def _return_event(code, instruction, retval):
11631163
or (
11641164
info.pydev_step_cmd == CMD_STEP_INTO_MY_CODE
11651165
and frame.f_back is not None
1166-
and not py_db.apply_files_filter(frame.f_back, frame.f_back.f_code.co_filename, py_db.get_use_libraries_filter())
1166+
and not py_db.apply_files_filter(frame.f_back, frame.f_back.f_code.co_filename, True)
11671167
)
11681168
):
11691169
_show_return_values(frame, retval)

0 commit comments

Comments
 (0)