simplify: combine parse_known{,_and_unknown}_arguments

Author: Buck Golemon

_pytest/config.py

@@ -477,12 +477,6 @@ def _getparser(self):
         return optparser
 
     def parse_known_args(self, args, namespace=None):
-        """parses and returns a namespace object with known arguments at this
-        point.
-        """
-        return self.parse_known_and_unknown_args(args, namespace=namespace)[0]
-
-    def parse_known_and_unknown_args(self, args, namespace=None):
         """parses and returns a namespace object with known arguments, and
         the remaining arguments unknown at this point.
         """
@@ -897,7 +891,7 @@ def pytest_load_initial_conftests(self, early_config):
         self.pluginmanager._set_initial_conftests(early_config.known_args_namespace)
 
     def _initini(self, args):
-        ns, unknown_args = self._parser.parse_known_and_unknown_args(args, namespace=self.option.copy())
+        ns, unknown_args = self._parser.parse_known_args(args, namespace=self.option.copy())
         r = determine_setup(ns.inifilename, ns.file_or_dir + unknown_args)
         self.rootdir, self.inifile, self.inicfg = r
         self._parser.extra_info['rootdir'] = self.rootdir
@@ -918,7 +912,8 @@ def _preparse(self, args, addopts=True):
         except ImportError as e:
             self.warn("I2", "could not load setuptools entry import: %s" % (e,))
         self.pluginmanager.consider_env()
-        self.known_args_namespace = ns = self._parser.parse_known_args(args, namespace=self.option.copy())
+        self.known_args_namespace = ns = self.option.copy()
+        self._parser.parse_known_args(args, namespace=ns)
         if self.known_args_namespace.confcutdir is None and self.inifile:
             confcutdir = py.path.local(self.inifile).dirname
             self.known_args_namespace.confcutdir = confcutdir

testing/test_parseopt.py

@@ -105,14 +105,14 @@ def test_parse2(self, parser):
     def test_parse_known_args(self, parser):
         parser.parse_known_args([py.path.local()])
         parser.addoption("--hello", action="store_true")
-        ns = parser.parse_known_args(["x", "--y", "--hello", "this"])
+        ns, _ = parser.parse_known_args(["x", "--y", "--hello", "this"])
         assert ns.hello
         assert ns.file_or_dir == ['x']
 
     def test_parse_known_and_unknown_args(self, parser):
         parser.addoption("--hello", action="store_true")
-        ns, unknown = parser.parse_known_and_unknown_args(["x", "--y",
-                                                           "--hello", "this"])
+        ns, unknown = parser.parse_known_args(["x", "--y",
+                                               "--hello", "this"])
         assert ns.hello
         assert ns.file_or_dir == ['x']
         assert unknown == ['--y', 'this']