summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-05-20 05:00:00 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2017-05-20 05:00:00 +0200
commit65cc00e0998cc0e645f0df386045365380be79ad (patch)
treea76f57806cb548204f19fc0245d6072251c80e61
parentbabd2b73538fcb6f3931f0ab6d9c100df6f37bcb (diff)
downloadpsutil-65cc00e0998cc0e645f0df386045365380be79ad.tar.gz
fix TypeError
-rw-r--r--psutil/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/psutil/__init__.py b/psutil/__init__.py
index fc45abf1..50ae2a33 100644
--- a/psutil/__init__.py
+++ b/psutil/__init__.py
@@ -1646,7 +1646,9 @@ def cpu_count(logical=True):
ret = _psplatform.cpu_count_logical()
else:
ret = _psplatform.cpu_count_physical()
- return ret if ret >= 1 else None
+ if ret is not None and ret < 1:
+ ret = None
+ return ret
def cpu_times(percpu=False):