Skip to content

Attempt to fix potential reference leaks #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Attempt to fix potential reference leaks #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions src/_time_machine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,14 @@ _time_machine_patch(PyObject *module, PyObject *unused)
Py_RETURN_NONE;

PyObject *datetime_module = PyImport_ImportModule("datetime");
if (datetime_module == NULL) {
return NULL; // Propagate ImportError
}
PyObject *time_module = PyImport_ImportModule("time");
if (time_module == NULL) {
Py_DECREF(datetime_module);
return NULL; // Propagate ImportError
}
PyObject *datetime_class = PyObject_GetAttrString(datetime_module, "datetime");

PyCFunctionObject *datetime_datetime_now =
Expand All @@ -532,8 +540,6 @@ _time_machine_patch(PyObject *module, PyObject *unused)
Py_DECREF(datetime_class);
Py_DECREF(datetime_module);

PyObject *time_module = PyImport_ImportModule("time");

/*
time.clock_gettime(), only available on Unix platforms.
*/
Expand Down Expand Up @@ -625,6 +631,14 @@ _time_machine_unpatch(PyObject *module, PyObject *unused)
Py_RETURN_NONE;

PyObject *datetime_module = PyImport_ImportModule("datetime");
if (datetime_module == NULL) {
return NULL; // Propagate ImportError
}
PyObject *time_module = PyImport_ImportModule("time");
if (time_module == NULL) {
Py_DECREF(datetime_module);
return NULL; // Propagate ImportError
}
PyObject *datetime_class = PyObject_GetAttrString(datetime_module, "datetime");

PyCFunctionObject *datetime_datetime_now =
Expand All @@ -646,8 +660,6 @@ _time_machine_unpatch(PyObject *module, PyObject *unused)
Py_DECREF(datetime_class);
Py_DECREF(datetime_module);

PyObject *time_module = PyImport_ImportModule("time");

/*
time.clock_gettime(), only available on Unix platforms.
*/
Expand Down
36 changes: 36 additions & 0 deletions tests/test_time_machine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,42 @@ def test_uuid1():
# error handling tests


@pytest.mark.parametrize(
"module",
[
"datetime",
"time",
],
)
def test_start_import_error(module):
with (
mock.patch.dict(sys.modules, {module: None}),
pytest.raises(ModuleNotFoundError) as excinfo,
):
time_machine.travel(EPOCH).start()

assert excinfo.value.args == (f"import of {module} halted; None in sys.modules",)


@pytest.mark.parametrize(
"module",
[
"datetime",
"time",
],
)
def test_stop_import_error(module):
traveller = time_machine.travel(EPOCH)
traveller.start()
with (
mock.patch.dict(sys.modules, {module: None}),
pytest.raises(ModuleNotFoundError) as excinfo,
):
traveller.stop()

assert excinfo.value.args == (f"import of {module} halted; None in sys.modules",)


@pytest.mark.parametrize(
"func, args",
[
Expand Down
Loading