Skip to content
This repository has been archived by the owner on Oct 3, 2019. It is now read-only.

Commit

Permalink
Merge e6a05b0 into 82d07aa
Browse files Browse the repository at this point in the history
  • Loading branch information
jacebrowning committed Jan 6, 2017
2 parents 82d07aa + e6a05b0 commit 476ac00
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Revision History

## 1.2 (unreleased)

- Updated base class to hide `pytest` traceback in wrapped methods.

## 1.1 (2016/10/22)

- Add `data` property to `Mapper` as a hook for other serialization libraries.
- Added `data` property to `Mapper` as a hook for other serialization libraries.

## 1.0.1 (2016/09/23)

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ COVERAGE_SPACE := $(BIN_)coverage.space

RANDOM_SEED ?= $(shell date +%s)

PYTEST_CORE_OPTS := --doctest-modules -r xXw -vv
PYTEST_CORE_OPTS := --doctest-modules -ra -vv
PYTEST_COV_OPTS := --cov=$(PACKAGE) --no-cov-on-fail --cov-report=term-missing --cov-report=html
PYTEST_RANDOM_OPTS := --random --random-seed=$(RANDOM_SEED)

Expand Down
2 changes: 1 addition & 1 deletion yorm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
from .bases import Container, Converter, Mappable

__project__ = 'YORM'
__version__ = '1.1'
__version__ = '1.2b1'
4 changes: 4 additions & 0 deletions yorm/bases/mappable.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ def load_before(method):
@functools.wraps(method)
def wrapped(self, *args, **kwargs):
"""Decorated method."""
__tracebackhide__ = True # pylint: disable=unused-variable

if not _private_call(method, args):
mapper = common.get_mapper(self)
if mapper and mapper.modified:
Expand All @@ -43,6 +45,8 @@ def save_after(method):
@functools.wraps(method)
def wrapped(self, *args, **kwargs):
"""Decorated method."""
__tracebackhide__ = True # pylint: disable=unused-variable

result = method(self, *args, **kwargs)

if not _private_call(method, args):
Expand Down

0 comments on commit 476ac00

Please sign in to comment.