p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move nullcontext import to src._pytest.logging.

This commit is contained in:
Hasan Ramezani 2021-12-26 20:46:42 +01:00
parent 3d7cd77017
commit 400915067f
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/_pytest/compat.py
View File

@ -4,7 +4,6 @@ import functools
import inspect import inspect
import os import os
import sys import sys
from contextlib import nullcontext as nullcontext # noqa: F401
from inspect import Parameter from inspect import Parameter
from inspect import signature from inspect import signature
from pathlib import Path from pathlib import Path

2
src/_pytest/logging.py
View File

@ -4,6 +4,7 @@ import logging
import os import os
import re import re
from contextlib import contextmanager from contextlib import contextmanager
from contextlib import nullcontext
from io import StringIO from io import StringIO
from pathlib import Path from pathlib import Path
from typing import AbstractSet from typing import AbstractSet
@ -21,7 +22,6 @@ from _pytest import nodes
from _pytest._io import TerminalWriter from _pytest._io import TerminalWriter
from _pytest.capture import CaptureManager from _pytest.capture import CaptureManager
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import nullcontext
from _pytest.config import _strtobool from _pytest.config import _strtobool
from _pytest.config import Config from _pytest.config import Config
from _pytest.config import create_terminal_writer from _pytest.config import create_terminal_writer