Skip to content

Commit 9370fa5

Browse files
committed
Merge branch 'master' of github.com:pythonprofilers/memory_profiler into async-profile
2 parents 1648c6b + d986422 commit 9370fa5

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,9 +419,9 @@ Send issues, proposals, etc. to `github's issue tracker
419419
<https://github.com/pythonprofilers/memory_profiler/issues>`_ .
420420

421421
If you've got questions regarding development, you can email me
422-
directly at fabian@fseoane.net
422+
directly at f@bianp.net
423423

424-
.. image:: http://fseoane.net/static/tux_memory_small.png
424+
.. image:: http://fa.bianp.net/static/tux_memory_small.png
425425

426426

427427
=============

memory_profiler/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# .. we'll use this to pass it to the child script ..
44
_CLEAN_GLOBALS = globals().copy()
55

6-
__version__ = '0.56.0'
6+
__version__ = '0.57.0'
77

88

99
from functools import wraps
@@ -707,7 +707,7 @@ def memit(self, line='', cell=None):
707707
timeout=timeout, interval=interval,
708708
max_usage=True,
709709
include_children=include_children)
710-
mem_usage.append(tmp[0])
710+
mem_usage.append(tmp)
711711

712712
result = MemitResult(mem_usage, baseline, repeat, timeout, interval,
713713
include_children)

0 commit comments

Comments
 (0)