From 2cd69cf632801ac975b55881d7cb3d3c17a09b0a Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Thu, 22 Feb 2018 15:13:01 +0100
Subject: [PATCH] sort out import misstake

---
 _pytest/mark/__init__.py | 8 ++++++--
 _pytest/python.py        | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/_pytest/mark/__init__.py b/_pytest/mark/__init__.py
index 0856cf926..f22db5820 100644
--- a/_pytest/mark/__init__.py
+++ b/_pytest/mark/__init__.py
@@ -3,11 +3,15 @@ from __future__ import absolute_import, division, print_function
 from _pytest.config import UsageError
 from .structures import (
     ParameterSet, EMPTY_PARAMETERSET_OPTION, MARK_GEN,
-    Mark, MarkInfo, MarkDecorator,
+    Mark, MarkInfo, MarkDecorator, MarkGenerator,
+    transfer_markers, get_empty_parameterset_mark
 )
 from .legacy import matchkeyword, matchmark
 
-__all__ = ['Mark', 'MarkInfo', 'MarkDecorator']
+__all__ = [
+    'Mark', 'MarkInfo', 'MarkDecorator', 'MarkGenerator',
+    'transfer_markers', 'get_empty_parameterset_mark'
+]
 
 
 class MarkerError(Exception):
diff --git a/_pytest/python.py b/_pytest/python.py
index 9f633812f..cdcfed49b 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -28,7 +28,7 @@ from _pytest.compat import (
     safe_str, getlocation, enum,
 )
 from _pytest.outcomes import fail
-from _pytest.mark.legacy import transfer_markers
+from _pytest.mark.structures import transfer_markers
 
 
 # relative paths that we use to filter traceback entries from appearing to the user;