Skip to content

Commit ef57de4

Browse files
authored
Merge pull request #340 from henryfung3a27/master
Fix UnicodeDecodeError during installation
2 parents 70615bc + 7f5975c commit ef57de4

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ file ~/.ipython/ipy_user_conf.py to add the following lines::
411411
Memory tracking backends
412412
===============================
413413
`memory_profiler` supports different memory tracking backends including: 'psutil', 'psutil_pss', 'psutil_uss', 'posix', 'tracemalloc'.
414-
If no specific backend is specified the default is to use "psutil" which measures RSS aka Resident Set Size.
414+
If no specific backend is specified the default is to use "psutil" which measures RSS aka "Resident Set Size".
415415
In some cases (particularly when tracking child processes) RSS may overestimate memory usage (see `example/example_psutil_memory_full_info.py` for an example).
416416
For more information on "psutil_pss" (measuring PSS) and "psutil_uss" please refer to:
417417
https://psutil.readthedocs.io/en/latest/index.html?highlight=memory_info#psutil.Process.memory_full_info

memory_profiler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ def memory_usage(proc=-1, interval=.1, timeout=None, timestamps=False,
311311
312312
backend : str, optional
313313
Current supported backends: 'psutil', 'psutil_pss', 'psutil_uss', 'posix', 'tracemalloc'
314-
If `backend=None` the default is "psutil" which measures RSS aka Resident Set Size.
314+
If `backend=None` the default is "psutil" which measures RSS aka "Resident Set Size".
315315
For more information on "psutil_pss" (measuring PSS) and "psutil_uss" please refer to:
316316
https://psutil.readthedocs.io/en/latest/index.html?highlight=memory_info#psutil.Process.memory_full_info
317317

0 commit comments

Comments
 (0)