diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2021-09-26 22:04:10 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2021-09-26 22:04:10 +0200 |
| commit | 3e2470366f74c8fd060905f76a93afdc3f033161 (patch) | |
| tree | 1a5bed26affde41bbe4892705944d1e42ca653e3 | |
| parent | 11429f87725ab8e301ab5f4e3e43d45590c0de03 (diff) | |
| parent | dccf8bedf34fced63f1962dd77b58f0da339759c (diff) | |
| download | psutil-3e2470366f74c8fd060905f76a93afdc3f033161.tar.gz | |
Merge branch 'master' of github.com:giampaolo/psutil
| -rw-r--r-- | CREDITS | 10 | ||||
| -rw-r--r-- | HISTORY.rst | 2 | ||||
| -rw-r--r-- | INSTALL.rst | 2 | ||||
| -rw-r--r-- | docs/index.rst | 4 | ||||
| -rw-r--r-- | psutil/__init__.py | 2 | ||||
| -rw-r--r-- | psutil/arch/windows/disk.c | 1 |
6 files changed, 17 insertions, 4 deletions
@@ -748,3 +748,13 @@ I: 1921 N: MaWe2019 W: https://github.com/MaWe2019 I: 1953 + +N: Dmitry Gorbunov +C: Russia +E: gorbunov.dmitry.1999@gmail.com +W: https://gorbunov-dmitry.github.io +D: fix typos in documentation + +N: Pablo Baeyens +W: https://github.com/mx-psi +I: 1598 diff --git a/HISTORY.rst b/HISTORY.rst index 82e5e782..4058d660 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -25,6 +25,8 @@ XXXX-XX-XX - 1921_: [Windows] psutil.swap_memory() shows committed memory instead of swap - 1953_: [Windows] disk_partitions() crashes due to insufficient buffer len. (patch by MaWe2019) +- 1598_: [Windows] psutil.disk_partitions() only returns mountpoints on drives + where it first finds one 5.8.0 ===== diff --git a/INSTALL.rst b/INSTALL.rst index 22693b56..c7efea5e 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -93,7 +93,7 @@ If you don't have pip you can install with wget:: wget https://bootstrap.pypa.io/get-pip.py -O - | python3 -...ow with curl:: +...or with curl:: python3 < <(curl -s https://bootstrap.pypa.io/get-pip.py) diff --git a/docs/index.rst b/docs/index.rst index 3473ebfe..11ea8780 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -263,7 +263,7 @@ CPU .. function:: cpu_freq(percpu=False) - Return CPU frequency as a nameduple including *current*, *min* and *max* + Return CPU frequency as a named tuple including *current*, *min* and *max* frequencies expressed in Mhz. On Linux *current* frequency reports the real-time value, on all other platforms it represents the nominal "fixed" value. @@ -419,7 +419,7 @@ Disks Note that this may not be fully reliable on all systems (e.g. on BSD this parameter is ignored). See `disk_usage.py`_ script providing an example usage. - Returns a list of namedtuples with the following fields: + Returns a list of named tuples with the following fields: * **device**: the device path (e.g. ``"/dev/hda1"``). On Windows this is the drive letter (e.g. ``"C:\\"``). diff --git a/psutil/__init__.py b/psutil/__init__.py index 0b5dff55..92b6398a 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -1851,7 +1851,7 @@ def cpu_stats(): if hasattr(_psplatform, "cpu_freq"): def cpu_freq(percpu=False): - """Return CPU frequency as a nameduple including current, + """Return CPU frequency as a namedtuple including current, min and max frequency expressed in Mhz. If *percpu* is True and the system supports per-cpu frequency diff --git a/psutil/arch/windows/disk.c b/psutil/arch/windows/disk.c index 0d8be2fa..7c35e812 100644 --- a/psutil/arch/windows/disk.c +++ b/psutil/arch/windows/disk.c @@ -290,6 +290,7 @@ psutil_disk_partitions(PyObject *self, PyObject *args) { mp_h = FindFirstVolumeMountPoint( drive_letter, mp_buf, MAX_PATH); if (mp_h != INVALID_HANDLE_VALUE) { + mp_flag = TRUE; while (mp_flag) { // Append full mount path with drive letter strcpy_s(mp_path, _countof(mp_path), drive_letter); |