summaryrefslogtreecommitdiff
path: root/psutil/_common.py
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2018-06-26 16:57:36 -0700
committerGitHub <noreply@github.com>2018-06-26 16:57:36 -0700
commit2f60e997fc1c500e0c245979bbecf2761f36e820 (patch)
tree5459ce3b71fad107ec41c8b720811a8110a3380d /psutil/_common.py
parent7a3ed446447ec845a7d03b32233b4ed7b48f3c26 (diff)
downloadpsutil-2f60e997fc1c500e0c245979bbecf2761f36e820.tar.gz
Rename OSX to macOS (#1298)
rename OSX to macOS
Diffstat (limited to 'psutil/_common.py')
-rw-r--r--psutil/_common.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/psutil/_common.py b/psutil/_common.py
index af1fb563..6fcf8fe0 100644
--- a/psutil/_common.py
+++ b/psutil/_common.py
@@ -42,8 +42,8 @@ PY3 = sys.version_info[0] == 3
__all__ = [
# constants
- 'FREEBSD', 'BSD', 'LINUX', 'NETBSD', 'OPENBSD', 'OSX', 'POSIX', 'SUNOS',
- 'WINDOWS',
+ 'FREEBSD', 'BSD', 'LINUX', 'NETBSD', 'OPENBSD', 'MACOS', 'OSX', 'POSIX',
+ 'SUNOS', 'WINDOWS',
'ENCODING', 'ENCODING_ERRS', 'AF_INET6',
# connection constants
'CONN_CLOSE', 'CONN_CLOSE_WAIT', 'CONN_CLOSING', 'CONN_ESTABLISHED',
@@ -75,7 +75,8 @@ __all__ = [
POSIX = os.name == "posix"
WINDOWS = os.name == "nt"
LINUX = sys.platform.startswith("linux")
-OSX = sys.platform.startswith("darwin")
+MACOS = sys.platform.startswith("darwin")
+OSX = MACOS # deprecated alias
FREEBSD = sys.platform.startswith("freebsd")
OPENBSD = sys.platform.startswith("openbsd")
NETBSD = sys.platform.startswith("netbsd")
@@ -99,7 +100,7 @@ STATUS_ZOMBIE = "zombie"
STATUS_DEAD = "dead"
STATUS_WAKE_KILL = "wake-kill"
STATUS_WAKING = "waking"
-STATUS_IDLE = "idle" # FreeBSD, OSX
+STATUS_IDLE = "idle" # FreeBSD, macOS
STATUS_LOCKED = "locked" # FreeBSD
STATUS_WAITING = "waiting" # FreeBSD
STATUS_SUSPENDED = "suspended" # NetBSD