11import argparse
22from functools import partial
33
4- import py
4+ from _pytest import pathlib
5+ from _pytest ._io import TerminalWriter
56
67from pytest_benchmark .csv import CSVResults
78
@@ -118,13 +119,15 @@ def make_parser():
118119
119120
120121class HookDispatch (object ):
121- def __init__ (self ):
122- conftest_file = py . path . local ('conftest.py' )
123- if conftest_file .check ():
124- self .conftest = conftest_file . pyimport ( )
122+ def __init__ (self , ** kwargs ):
123+ conftest_file = pathlib . Path ('conftest.py' )
124+ if conftest_file .exists ():
125+ self .conftest = pathlib . import_path ( conftest_file , ** kwargs )
125126 else :
126127 self .conftest = None
127128
129+ print (f'>>>>>>>>>> { self .conftest } ' )
130+
128131 def __getattr__ (self , item ):
129132 default = getattr (plugin , item )
130133 return getattr (self .conftest , item , default )
@@ -139,7 +142,7 @@ def main():
139142 logger = Logger (level )
140143 storage = load_storage (args .storage , logger = logger , netrc = args .netrc )
141144
142- hook = HookDispatch ()
145+ hook = HookDispatch (mode = args . importmode , root = pathlib . Path ( '.' ) )
143146
144147 if args .command == 'list' :
145148 for file in storage .query ():
@@ -172,7 +175,7 @@ def main():
172175
173176class TerminalReporter (object ):
174177 def __init__ (self ):
175- self ._tw = py . io . TerminalWriter ()
178+ self ._tw = TerminalWriter ()
176179
177180 def ensure_newline (self ):
178181 pass
@@ -181,8 +184,8 @@ def write(self, content, **markup):
181184 self ._tw .write (content , ** markup )
182185
183186 def write_line (self , line , ** markup ):
184- if not py . builtin . _istext (line ):
185- line = py . builtin . text ( line , errors = "replace" )
187+ if not isinstance (line , str ):
188+ line = line . decode ( errors = "replace" )
186189 self ._tw .line (line , ** markup )
187190
188191 def rewrite (self , line , ** markup ):
0 commit comments