Avoid reporting missing coverage for deprecated or py3 paths

This commit is contained in:
Alessandro Molina 2016-02-11 15:35:09 +01:00
parent d5e3441d88
commit 55fd96ee6c
2 changed files with 26 additions and 26 deletions

View File

@ -206,19 +206,19 @@ class DispatchState(object):
""" """
return self._routing_args return self._routing_args
def add_method(self, method, remainder): def add_method(self, method, remainder): # pragma: no cover
warnings.warn("add_method is deprecated, please use set_action instead", warnings.warn("add_method is deprecated, please use set_action instead",
DeprecationWarning, stacklevel=2) DeprecationWarning, stacklevel=2)
self.set_action(method, remainder) self.set_action(method, remainder)
@property @property
def method(self): def method(self): # pragma: no cover
warnings.warn(".method is deprecated, please use .action instead", warnings.warn(".method is deprecated, please use .action instead",
DeprecationWarning, stacklevel=2) DeprecationWarning, stacklevel=2)
return self.action return self.action
@property @property
def dispatcher(self): def dispatcher(self): # pragma: no cover
warnings.warn(".dispatcher is deprecated, please use .root_dispatcher instead", warnings.warn(".dispatcher is deprecated, please use .root_dispatcher instead",
DeprecationWarning, stacklevel=2) DeprecationWarning, stacklevel=2)
return self.root_dispatcher return self.root_dispatcher

View File

@ -23,34 +23,34 @@ class _NotFound(object):
def _getargspec(func): def _getargspec(func):
if not hasattr(inspect, 'signature'): if not hasattr(inspect, 'signature'):
return inspect.getargspec(func) return inspect.getargspec(func)
else: #pragma: no cover
sig = inspect.signature(func) sig = inspect.signature(func)
args = [ args = [
p.name for p in sig.parameters.values() p.name for p in sig.parameters.values()
if p.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD if p.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD
] ]
varargs = [ varargs = [
p.name for p in sig.parameters.values() p.name for p in sig.parameters.values()
if p.kind == inspect.Parameter.VAR_POSITIONAL if p.kind == inspect.Parameter.VAR_POSITIONAL
] ]
varargs = varargs[0] if varargs else None varargs = varargs[0] if varargs else None
varkw = [ varkw = [
p.name for p in sig.parameters.values() p.name for p in sig.parameters.values()
if p.kind == inspect.Parameter.VAR_KEYWORD if p.kind == inspect.Parameter.VAR_KEYWORD
] ]
varkw = varkw[0] if varkw else None varkw = varkw[0] if varkw else None
defaults = tuple(( defaults = tuple((
p.default for p in sig.parameters.values() p.default for p in sig.parameters.values()
if p.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD and p.default is not p.empty if p.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD and p.default is not p.empty
)) or None )) or None
return args, varargs, varkw, defaults return args, varargs, varkw, defaults
_cached_argspecs = {} _cached_argspecs = {}
def get_argspec(func): def get_argspec(func):
if _PY2: if _PY2:
im_func = getattr(func, 'im_func', func) im_func = getattr(func, 'im_func', func)
else: else: #pragma: no cover
im_func = getattr(func, '__func__', func) im_func = getattr(func, '__func__', func)
try: try:
@ -230,7 +230,7 @@ class Path(collections.deque):
def __str__(self): def __str__(self):
return str(self.separator).join(self) return str(self.separator).join(self)
def __unicode__(self): # pragma: no cover def __unicode__(self): # pragma: no cover
#unused on PY3 #unused on PY3
return unicode(self.separator).join(self) return unicode(self.separator).join(self)