diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 09:44:11 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 09:44:11 -0700 |
| commit | e589c6ed1dac7755bb7bd9e181a43ebeff62dcec (patch) | |
| tree | 8e2483be85050e4cbc7853964392e437e2395764 /numpy | |
| parent | 688bc60658b391524c6b641e0a5e5ecd73322d02 (diff) | |
| parent | 9d849ede86cdb156a124722ce14abf1e985e6d0b (diff) | |
| download | numpy-e589c6ed1dac7755bb7bd9e181a43ebeff62dcec.tar.gz | |
Merge pull request #3239 from pv/skipif-lf
ENH: testing: remove an annoying line feed from skipif decorator
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/testing/decorators.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/testing/decorators.py b/numpy/testing/decorators.py index ac3526ea7..b0ddb1880 100644 --- a/numpy/testing/decorators.py +++ b/numpy/testing/decorators.py @@ -135,9 +135,9 @@ def skipif(skip_condition, msg=None): if msg is None: out = 'Test skipped due to test condition' else: - out = '\n'+msg + out = msg - return "Skipping test: %s%s" % (func.__name__,out) + return "Skipping test: %s: %s" % (func.__name__, out) # We need to define *two* skippers because Python doesn't allow both # return with value and yield inside the same function. |