summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-09-23 14:25:20 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2016-09-23 14:25:20 +0200
commit3eab7cbb79bc37b13b85c16cd79bc35e616e049c (patch)
tree9afa2194d0830acd6a81efc0da96edf2bcee2bf7
parent9c269edb5132fffacdd9af493c95b199ee02f551 (diff)
downloadpsutil-3eab7cbb79bc37b13b85c16cd79bc35e616e049c.tar.gz
#874: update docs/history/credits
-rw-r--r--CREDITS4
-rw-r--r--HISTORY.rst1
-rw-r--r--docs/index.rst2
-rw-r--r--psutil/tests/test_system.py2
4 files changed, 8 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 206f1a55..7be5f200 100644
--- a/CREDITS
+++ b/CREDITS
@@ -408,3 +408,7 @@ C: Montreal, QC, Canada
E: andre.l.caron@gmail.com
W: https://github.com/AndreLouisCaron
I: 880
+
+N: ewedlund
+W: https://github.com/ewedlund
+I: 874
diff --git a/HISTORY.rst b/HISTORY.rst
index cd6a7936..a429ce65 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -6,6 +6,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues
**Enhancements**
+- #874: [Windows] net_if_addrs() returns also the netmask.
- #887: [Linux] virtual_memory()'s 'available' and 'used' values are more
precise and match "free" cmdline utility. "available" also takes into
account LCX containers preventing "available" to overflow "total".
diff --git a/docs/index.rst b/docs/index.rst
index 9c225ea4..534233ee 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -536,6 +536,8 @@ Network
.. versionchanged:: 3.2.0 *ptp* field was added.
+ .. versionchanged:: 4.4.0 *netmask* field on Windows is no longer ``None``.
+
.. function:: net_if_stats()
Return information about each NIC (network interface card) installed on the
diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
index 53f10fd4..1cfe4f55 100644
--- a/psutil/tests/test_system.py
+++ b/psutil/tests/test_system.py
@@ -563,7 +563,7 @@ class TestSystemAPIs(unittest.TestCase):
for addr in addrs:
self.assertIsInstance(addr.family, int)
self.assertIsInstance(addr.address, str)
- self.assertIsInstance(addr.netmask, (str, type(None)))
+ self.assertIsInstance(addr.netmask, str)
self.assertIsInstance(addr.broadcast, (str, type(None)))
self.assertIn(addr.family, families)
if sys.version_info >= (3, 4):