summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2015-11-25 02:20:34 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2015-11-25 02:20:34 +0100
commita5f9fbca765e5e1bdffa2a973d95e8210c0848e3 (patch)
tree581862be479637e96080d6f1b3e8016734872f09
parentee41e18a75f4a8a88dd1cc4e19ca27cb03c081d5 (diff)
downloadpsutil-release-3.3.0.tar.gz
pre-release changesrelease-3.3.0
-rw-r--r--HISTORY.rst4
-rw-r--r--README.rst1
-rw-r--r--docs/index.rst1
-rw-r--r--psutil/arch/bsd/openbsd.c4
4 files changed, 7 insertions, 3 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index 6f5edabc..cca4c653 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,13 +1,13 @@
Bug tracker at https://github.com/giampaolo/psutil/issues
-3.3.0 - XXXX-XX-XX
+3.3.0 - 2015-11-25
==================
**Enhancements**
- #558: [Linux] exposed psutil.PROCFS_PATH constant to change the default
location of /proc filesystem.
-- #615: [OpenBSD] added OpenBSD support.
+- #615: [OpenBSD] added OpenBSD support. (contributed by Landry Breuil)
**Bug fixes**
diff --git a/README.rst b/README.rst
index 98cb68c2..2919b79c 100644
--- a/README.rst
+++ b/README.rst
@@ -346,6 +346,7 @@ http://groups.google.com/group/psutil/
Timeline
========
+- 2015-11-25: `psutil-3.3.0.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.3.0.tar.gz>`_
- 2015-10-04: `psutil-3.2.2.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.2.2.tar.gz>`_
- 2015-09-03: `psutil-3.2.1.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.2.1.tar.gz>`_
- 2015-09-02: `psutil-3.2.0.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.2.0.tar.gz>`_
diff --git a/docs/index.rst b/docs/index.rst
index 026df886..363c6332 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,6 +1,7 @@
.. module:: psutil
:synopsis: psutil module
.. moduleauthor:: Giampaolo Rodola' <grodola@gmail.com>
+.. versionchanged:: 3.3.0 added support for OpenBSD
.. warning::
diff --git a/psutil/arch/bsd/openbsd.c b/psutil/arch/bsd/openbsd.c
index e5972820..9fd52846 100644
--- a/psutil/arch/bsd/openbsd.c
+++ b/psutil/arch/bsd/openbsd.c
@@ -382,7 +382,9 @@ psutil_swap_mem(PyObject *self, PyObject *args) {
swap_total * DEV_BSIZE,
(swap_total - swap_free) * DEV_BSIZE,
swap_free * DEV_BSIZE,
- // TODO: swap in / swap out
+ // swap in / swap out is not supported as the
+ // swapent struct does not provide any info
+ // about it.
0, 0);
}