p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move FILE_OR_DIR constant out

This commit is contained in:
holger krekel 2013-09-28 09:52:41 +02:00
parent 1fc466e8ac
commit b80e875525
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
_pytest/config.py
View File

@ -93,7 +93,7 @@ class Parser:
a = option.attrs() a = option.attrs()
arggroup.add_argument(*n, **a) arggroup.add_argument(*n, **a)
# bash like autocompletion for dirs (appending '/') # bash like autocompletion for dirs (appending '/')
optparser.add_argument(Config._file_or_dir, nargs='*' optparser.add_argument(FILE_OR_DIR, nargs='*'
).completer=filescompleter ).completer=filescompleter
try_argcomplete(self.optparser) try_argcomplete(self.optparser)
return self.optparser.parse_args([str(x) for x in args]) return self.optparser.parse_args([str(x) for x in args])
@ -102,7 +102,7 @@ class Parser:
parsedoption = self.parse(args) parsedoption = self.parse(args)
for name, value in parsedoption.__dict__.items(): for name, value in parsedoption.__dict__.items():
setattr(option, name, value) setattr(option, name, value)
return getattr(parsedoption, Config._file_or_dir) return getattr(parsedoption, FILE_OR_DIR)
def addini(self, name, help, type=None, default=None): def addini(self, name, help, type=None, default=None):
""" register an ini-file option. """ register an ini-file option.
@ -323,22 +323,9 @@ class MyOptionParser(py.std.argparse.ArgumentParser):
if arg and arg[0] == '-': if arg and arg[0] == '-':
msg = py.std.argparse._('unrecognized arguments: %s') msg = py.std.argparse._('unrecognized arguments: %s')
self.error(msg % ' '.join(argv)) self.error(msg % ' '.join(argv))
getattr(args, Config._file_or_dir).extend(argv) getattr(args, FILE_OR_DIR).extend(argv)
return args return args
# #pylib 2013-07-31
# (12:05:53) anthon: hynek: can you get me a list of preferred py.test
# long-options with '-' inserted at the right places?
# (12:08:29) hynek: anthon, hpk: generally I'd love the following, decide
# yourself which you agree and which not:
# (12:10:51) hynek: --exit-on-first --full-trace --junit-xml --junit-prefix
# --result-log --collect-only --conf-cut-dir --trace-config
# --no-magic
# (12:18:21) hpk: hynek,anthon: makes sense to me.
# (13:40:30) hpk: hynek: let's not change names, rather only deal with
# hyphens for now
# (13:40:50) hynek: then --exit-first *shrug*
class DropShorterLongHelpFormatter(py.std.argparse.HelpFormatter): class DropShorterLongHelpFormatter(py.std.argparse.HelpFormatter):
"""shorten help for long options that differ only in extra hyphens """shorten help for long options that differ only in extra hyphens
@ -504,15 +491,15 @@ class CmdOptions(object):
def __repr__(self): def __repr__(self):
return "<CmdOptions %r>" %(self.__dict__,) return "<CmdOptions %r>" %(self.__dict__,)
FILE_OR_DIR = 'file_or_dir'
class Config(object): class Config(object):
""" access to configuration values, pluginmanager and plugin hooks. """ """ access to configuration values, pluginmanager and plugin hooks. """
_file_or_dir = 'file_or_dir'
def __init__(self, pluginmanager=None): def __init__(self, pluginmanager=None):
#: access to command line option as attributes. #: access to command line option as attributes.
#: (deprecated), use :py:func:`getoption() <_pytest.config.Config.getoption>` instead #: (deprecated), use :py:func:`getoption() <_pytest.config.Config.getoption>` instead
self.option = CmdOptions() self.option = CmdOptions()
_a = self._file_or_dir _a = FILE_OR_DIR
self._parser = Parser( self._parser = Parser(
usage="%%(prog)s [options] [%s] [%s] [...]" % (_a, _a), usage="%%(prog)s [options] [%s] [%s] [...]" % (_a, _a),
processopt=self._processopt, processopt=self._processopt,

10
testing/test_parseopt.py
View File

@ -95,11 +95,11 @@ class TestParser:
parser.addoption("--hello", dest="hello", action="store") parser.addoption("--hello", dest="hello", action="store")
args = parser.parse(['--hello', 'world']) args = parser.parse(['--hello', 'world'])
assert args.hello == "world" assert args.hello == "world"
assert not getattr(args, parseopt.Config._file_or_dir) assert not getattr(args, parseopt.FILE_OR_DIR)
def test_parse2(self, parser): def test_parse2(self, parser):
args = parser.parse([py.path.local()]) args = parser.parse([py.path.local()])
assert getattr(args, parseopt.Config._file_or_dir)[0] == py.path.local() assert getattr(args, parseopt.FILE_OR_DIR)[0] == py.path.local()
def test_parse_will_set_default(self, parser): def test_parse_will_set_default(self, parser):
parser.addoption("--hello", dest="hello", default="x", action="store") parser.addoption("--hello", dest="hello", default="x", action="store")
@ -128,13 +128,13 @@ class TestParser:
parser.addoption("-R", action='store_true') parser.addoption("-R", action='store_true')
parser.addoption("-S", action='store_false') parser.addoption("-S", action='store_false')
args = parser.parse(['-R', '4', '2', '-S']) args = parser.parse(['-R', '4', '2', '-S'])
assert getattr(args, parseopt.Config._file_or_dir) == ['4', '2'] assert getattr(args, parseopt.FILE_OR_DIR) == ['4', '2']
args = parser.parse(['-R', '-S', '4', '2', '-R']) args = parser.parse(['-R', '-S', '4', '2', '-R'])
assert getattr(args, parseopt.Config._file_or_dir) == ['4', '2'] assert getattr(args, parseopt.FILE_OR_DIR) == ['4', '2']
assert args.R == True assert args.R == True
assert args.S == False assert args.S == False
args = parser.parse(['-R', '4', '-S', '2']) args = parser.parse(['-R', '4', '-S', '2'])
assert getattr(args, parseopt.Config._file_or_dir) == ['4', '2'] assert getattr(args, parseopt.FILE_OR_DIR) == ['4', '2']
assert args.R == True assert args.R == True
assert args.S == False assert args.S == False