Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove CmdOptions since we can use argparse.Namespace() #3304

Merged
merged 1 commit into from
Mar 13, 2018
+7 −18
Merged

remove CmdOptions since we can use argparse.Namespace() #3304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions _pytest/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import traceback
import types
import warnings

import copy
import six
import py
# DON't import pytest here because it causes import cycle troubles
Expand Down Expand Up @@ -68,7 +68,7 @@ def main(args=None, plugins=None):
return 4


class cmdline(object): # compatibility namespace
class cmdline(object): # NOQA compatibility namespace
main = staticmethod(main)


Expand Down Expand Up @@ -845,19 +845,6 @@ def _ensure_removed_sysmodule(modname):
pass


class CmdOptions(object):
""" holds cmdline options as attributes."""

def __init__(self, values=()):
self.__dict__.update(values)

def __repr__(self):
return "<CmdOptions %r>" % (self.__dict__,)

def copy(self):
return CmdOptions(self.__dict__)


class Notset(object):
def __repr__(self):
return "<NOTSET>"
Expand Down Expand Up @@ -885,7 +872,7 @@ class Config(object):
def __init__(self, pluginmanager):
#: access to command line option as attributes.
#: (deprecated), use :py:func:`getoption() <_pytest.config.Config.getoption>` instead
self.option = CmdOptions()
self.option = argparse.Namespace()
_a = FILE_OR_DIR
self._parser = Parser(
usage="%%(prog)s [options] [%s] [%s] [...]" % (_a, _a),
Expand Down Expand Up @@ -989,7 +976,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_and_unknown_args(args, namespace=copy.copy(self.option))
r = determine_setup(ns.inifilename, ns.file_or_dir + unknown_args, warnfunc=self.warn,
rootdir_cmd_arg=ns.rootdir or None)
self.rootdir, self.inifile, self.inicfg = r
Expand Down Expand Up @@ -1054,7 +1041,8 @@ def _preparse(self, args, addopts=True):
self.pluginmanager.consider_preparse(args)
self.pluginmanager.load_setuptools_entrypoints('pytest11')
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._parser.parse_known_args(
args, namespace=copy.copy(self.option))
if self.known_args_namespace.confcutdir is None and self.inifile:
confcutdir = py.path.local(self.inifile).dirname
self.known_args_namespace.confcutdir = confcutdir
Expand Down
1 change: 1 addition & 0 deletions changelog/3304.trivial
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Internal refactoring to better integrate with argparse.