From b0d45267c58859bcb79f7ab980f4b410c4bbd109 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 2 Feb 2020 03:42:53 +0100
Subject: [PATCH] internal: clean up getfslineno

Everything was using `_pytest.compat.getfslineno` basically, which
wrapped `_pytest._code.source.getfslineno`.

This moves the extra code from there into it directly, and uses the
latter everywhere.

This helps to eventually remove the one in compat eventually, and also
causes less cyclic imports.
---
 src/_pytest/_code/source.py    |  8 ++++++++
 src/_pytest/compat.py          | 12 ++++--------
 src/_pytest/fixtures.py        |  2 +-
 src/_pytest/mark/structures.py |  2 +-
 src/_pytest/nodes.py           |  2 +-
 src/_pytest/python.py          |  2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/_pytest/_code/source.py b/src/_pytest/_code/source.py
index 379393b10..b5e18863f 100644
--- a/src/_pytest/_code/source.py
+++ b/src/_pytest/_code/source.py
@@ -17,6 +17,7 @@ from typing import Union
 
 import py
 
+from _pytest.compat import get_real_func
 from _pytest.compat import overload
 from _pytest.compat import TYPE_CHECKING
 
@@ -290,6 +291,13 @@ def getfslineno(obj) -> Tuple[Optional[Union["Literal['']", py.path.local]], int
     """
     from .code import Code
 
+    # xxx let decorators etc specify a sane ordering
+    # NOTE: this used to be done in _pytest.compat.getfslineno, initially added
+    #       in 6ec13a2b9.  It ("place_as") appears to be something very custom.
+    obj = get_real_func(obj)
+    if hasattr(obj, "place_as"):
+        obj = obj.place_as
+
     try:
         code = Code(obj)
     except TypeError:
diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py
index 085f634a4..d6ee1d522 100644
--- a/src/_pytest/compat.py
+++ b/src/_pytest/compat.py
@@ -22,7 +22,6 @@ from typing import Union
 import attr
 import py
 
-import _pytest
 from _pytest._io.saferepr import saferepr
 from _pytest.outcomes import fail
 from _pytest.outcomes import TEST_OUTCOME
@@ -308,13 +307,10 @@ def get_real_method(obj, holder):
 
 
 def getfslineno(obj) -> Tuple[Union[str, py.path.local], int]:
-    # xxx let decorators etc specify a sane ordering
-    obj = get_real_func(obj)
-    if hasattr(obj, "place_as"):
-        obj = obj.place_as
-    fslineno = _pytest._code.getfslineno(obj)
-    assert isinstance(fslineno[1], int), obj
-    return fslineno
+    """(**Deprecated**, use _pytest._code.source.getfslineno directly)"""
+    from _pytest._code.source import getfslineno
+
+    return getfslineno(obj)
 
 
 def getimfunc(func):
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
index 5b3686b58..a6bfeb6d3 100644
--- a/src/_pytest/fixtures.py
+++ b/src/_pytest/fixtures.py
@@ -16,12 +16,12 @@ import py
 import _pytest
 from _pytest._code.code import FormattedExcinfo
 from _pytest._code.code import TerminalRepr
+from _pytest._code.source import getfslineno
 from _pytest._io import TerminalWriter
 from _pytest.compat import _format_args
 from _pytest.compat import _PytestWrapper
 from _pytest.compat import get_real_func
 from _pytest.compat import get_real_method
-from _pytest.compat import getfslineno
 from _pytest.compat import getfuncargnames
 from _pytest.compat import getimfunc
 from _pytest.compat import getlocation
diff --git a/src/_pytest/mark/structures.py b/src/_pytest/mark/structures.py
index 3002f8abc..de4333a62 100644
--- a/src/_pytest/mark/structures.py
+++ b/src/_pytest/mark/structures.py
@@ -6,9 +6,9 @@ from typing import Set
 
 import attr
 
+from .._code.source import getfslineno
 from ..compat import ascii_escaped
 from ..compat import ATTRS_EQ_FIELD
-from ..compat import getfslineno
 from ..compat import NOTSET
 from _pytest.outcomes import fail
 from _pytest.warning_types import PytestUnknownMarkWarning
diff --git a/src/_pytest/nodes.py b/src/_pytest/nodes.py
index 5447f2541..218684e14 100644
--- a/src/_pytest/nodes.py
+++ b/src/_pytest/nodes.py
@@ -15,8 +15,8 @@ import _pytest._code
 from _pytest._code.code import ExceptionChainRepr
 from _pytest._code.code import ExceptionInfo
 from _pytest._code.code import ReprExceptionInfo
+from _pytest._code.source import getfslineno
 from _pytest.compat import cached_property
-from _pytest.compat import getfslineno
 from _pytest.compat import TYPE_CHECKING
 from _pytest.config import Config
 from _pytest.config import PytestPluginManager
diff --git a/src/_pytest/python.py b/src/_pytest/python.py
index 65ef1272b..525498de2 100644
--- a/src/_pytest/python.py
+++ b/src/_pytest/python.py
@@ -20,10 +20,10 @@ import _pytest
 from _pytest import fixtures
 from _pytest import nodes
 from _pytest._code import filter_traceback
+from _pytest._code.source import getfslineno
 from _pytest.compat import ascii_escaped
 from _pytest.compat import get_default_arg_names
 from _pytest.compat import get_real_func
-from _pytest.compat import getfslineno
 from _pytest.compat import getimfunc
 from _pytest.compat import getlocation
 from _pytest.compat import is_generator