@@ -477,12 +477,6 @@ def _getparser(self):
477
477
return optparser
478
478
479
479
def parse_known_args (self , args , namespace = None ):
480
- """parses and returns a namespace object with known arguments at this
481
- point.
482
- """
483
- return self .parse_known_and_unknown_args (args , namespace = namespace )[0 ]
484
-
485
- def parse_known_and_unknown_args (self , args , namespace = None ):
486
480
"""parses and returns a namespace object with known arguments, and
487
481
the remaining arguments unknown at this point.
488
482
"""
@@ -897,7 +891,7 @@ def pytest_load_initial_conftests(self, early_config):
897
891
self .pluginmanager ._set_initial_conftests (early_config .known_args_namespace )
898
892
899
893
def _initini (self , args ):
900
- ns , unknown_args = self ._parser .parse_known_and_unknown_args (args , namespace = self .option .copy ())
894
+ ns , unknown_args = self ._parser .parse_known_args (args , namespace = self .option .copy ())
901
895
r = determine_setup (ns .inifilename , ns .file_or_dir + unknown_args )
902
896
self .rootdir , self .inifile , self .inicfg = r
903
897
self ._parser .extra_info ['rootdir' ] = self .rootdir
@@ -918,7 +912,8 @@ def _preparse(self, args, addopts=True):
918
912
except ImportError as e :
919
913
self .warn ("I2" , "could not load setuptools entry import: %s" % (e ,))
920
914
self .pluginmanager .consider_env ()
921
- self .known_args_namespace = ns = self ._parser .parse_known_args (args , namespace = self .option .copy ())
915
+ self .known_args_namespace = ns = self .option .copy ()
916
+ self ._parser .parse_known_args (args , namespace = ns )
922
917
if self .known_args_namespace .confcutdir is None and self .inifile :
923
918
confcutdir = py .path .local (self .inifile ).dirname
924
919
self .known_args_namespace .confcutdir = confcutdir
0 commit comments