Rename OS vars for consistency

11 files changed, 42 insertions, 43 deletions

diff --git a/glances/autodiscover.py b/glances/autodiscover.py
index 7c13da5e..fa1414d4 100644
--- a/glances/autodiscover.py
+++ b/glances/autodiscover.py
@@ -22,7 +22,7 @@
 import socket
 import sys
 
-from glances.globals import appname, is_bsd
+from glances.globals import appname, BSD
 from glances.logger import logger
 
 try:
@@ -194,7 +194,7 @@ class GlancesAutoDiscoverClient(object):
 
             # XXX *BSDs: Segmentation fault (core dumped)
             # -- https://bitbucket.org/al45tair/netifaces/issues/15
-            if not is_bsd:
+            if not BSD:
                 try:
                     # -B @ overwrite the dynamic IPv4 choice
                     if zeroconf_bind_address == '0.0.0.0':
diff --git a/glances/config.py b/glances/config.py
index 0b886360..3e8570ea 100644
--- a/glances/config.py
+++ b/glances/config.py
@@ -24,7 +24,7 @@ import sys
 from io import open
 
 from glances.compat import ConfigParser, NoOptionError
-from glances.globals import appname, is_bsd, is_linux, is_mac, is_windows, sys_prefix
+from glances.globals import appname, BSD, LINUX, OSX, WINDOWS, sys_prefix
 from glances.logger import logger
 
 
@@ -65,24 +65,24 @@ class Config(object):
         if self.config_dir:
             paths.append(self.config_dir)
 
-        if is_linux or is_bsd:
+        if LINUX or BSD:
             paths.append(
                 os.path.join(os.environ.get('XDG_CONFIG_HOME') or
                              os.path.expanduser('~/.config'),
                              appname, self.config_filename))
-            if is_bsd:
+            if BSD:
                 paths.append(
                     os.path.join(sys.prefix, 'etc', appname, self.config_filename))
             else:
                 paths.append(
                     os.path.join('/etc', appname, self.config_filename))
-        elif is_mac:
+        elif OSX:
             paths.append(
                 os.path.join(os.path.expanduser('~/Library/Application Support/'),
                              appname, self.config_filename))
             paths.append(
                 os.path.join(sys_prefix, 'etc', appname, self.config_filename))
-        elif is_windows:
+        elif WINDOWS:
             paths.append(
                 os.path.join(os.environ.get('APPDATA'), appname, self.config_filename))
 
diff --git a/glances/globals.py b/glances/globals.py
index bbcd917a..8eba5090 100644
--- a/glances/globals.py
+++ b/glances/globals.py
@@ -29,11 +29,10 @@ psutil_version = __import__('glances').__psutil_version
 
 # Operating system flag
 # Note: Somes libs depends of OS
-is_bsd = sys.platform.find('bsd') != -1
-is_freebsd = sys.platform.startswith('freebsd')
-is_linux = sys.platform.startswith('linux')
-is_mac = sys.platform.startswith('darwin')
-is_windows = sys.platform.startswith('win')
+BSD = sys.platform.find('bsd') != -1
+LINUX = sys.platform.startswith('linux')
+OSX = sys.platform.startswith('darwin')
+WINDOWS = sys.platform.startswith('win')
 
 # Path definitions
 work_path = os.path.realpath(os.path.dirname(__file__))
diff --git a/glances/main.py b/glances/main.py
index 0221f038..dc903053 100644
--- a/glances/main.py
+++ b/glances/main.py
@@ -25,7 +25,7 @@ import sys
 import tempfile
 
 from glances.config import Config
-from glances.globals import appname, is_linux, is_windows, psutil_version, version
+from glances.globals import appname, LINUX, WINDOWS, psutil_version, version
 from glances.logger import logger
 
 
@@ -194,10 +194,10 @@ Start the client browser (browser mode):\n\
                             dest='process_short_name', help='force short name for processes name')
         parser.add_argument('-0', '--disable-irix', action='store_true', default=False,
                             dest='disable_irix', help='Task\'s cpu usage will be divided by the total number of CPUs')
-        if not is_windows:
+        if not WINDOWS:
             parser.add_argument('--hide-kernel-threads', action='store_true', default=False,
                                 dest='no_kernel_threads', help='hide kernel threads in process list')
-        if is_linux:
+        if LINUX:
             parser.add_argument('--tree', action='store_true', default=False,
                                 dest='process_tree', help='display processes as a tree')
         parser.add_argument('-b', '--byte', action='store_true', default=False,
diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py
index 5155ba8e..70b77ded 100644
--- a/glances/outputs/glances_curses.py
+++ b/glances/outputs/glances_curses.py
@@ -23,14 +23,14 @@ import re
 import sys
 
 from glances.compat import u
-from glances.globals import is_mac, is_windows
+from glances.globals import OSX, WINDOWS
 from glances.logger import logger
 from glances.logs import glances_logs
 from glances.processes import glances_processes
 from glances.timer import Timer
 
 # Import curses lib for "normal" operating system and consolelog for Windows
-if not is_windows:
+if not WINDOWS:
     try:
         import curses
         import curses.panel
@@ -705,7 +705,7 @@ class _GlancesCurses(object):
             self.new_line()
             self.display_plugin(stats_processlist,
                                 display_optional=(screen_x > 102),
-                                display_additional=(not is_mac),
+                                display_additional=(not OSX),
                                 max_y=(screen_y - self.get_stats_display_height(stats_alert) - 2))
             self.new_line()
             self.display_plugin(stats_alert)
@@ -794,7 +794,7 @@ class _GlancesCurses(object):
         for y, m in enumerate(message.split('\n')):
             popup.addnstr(2 + y, 2, m, len(m))
 
-        if is_input and not is_windows:
+        if is_input and not WINDOWS:
             # Create a subwindow for the text field
             subpop = popup.derwin(1, input_size, 2, 2 + len(m))
             subpop.attron(self.colors_list['FILTER'])
@@ -1250,7 +1250,7 @@ class GlancesCursesBrowser(_GlancesCurses):
 
         return True
 
-if not is_windows:
+if not WINDOWS:
     class GlancesTextbox(Textbox, object):
 
         def __init__(self, *args, **kwargs):
diff --git a/glances/password.py b/glances/password.py
index 48545552..becd469b 100644
--- a/glances/password.py
+++ b/glances/password.py
@@ -27,7 +27,7 @@ import uuid
 from io import open
 
 from glances.compat import b, input
-from glances.globals import appname, is_bsd, is_linux, is_mac, is_windows
+from glances.globals import appname, BSD, LINUX, OSX, WINDOWS
 from glances.logger import logger
 
 
@@ -47,11 +47,11 @@ class GlancesPassword(object):
         * OS X: ~/Library/glances
         * Windows: %APPDATA%\glances
         """
-        if is_linux or is_bsd:
+        if LINUX or BSD:
             app_path = os.environ.get('XDG_CONFIG_HOME') or os.path.expanduser('~/.config')
-        elif is_mac:
+        elif OSX:
             app_path = os.path.join(os.environ.get('HOME'), 'Library')
-        elif is_windows:
+        elif WINDOWS:
             app_path = os.environ.get('APPDATA')
         else:
             app_path = '.'
diff --git a/glances/plugins/glances_ip.py b/glances/plugins/glances_ip.py
index 70cd1437..cff7c780 100644
--- a/glances/plugins/glances_ip.py
+++ b/glances/plugins/glances_ip.py
@@ -20,13 +20,13 @@
 """IP plugin."""
 
 from glances.compat import iterkeys
-from glances.globals import is_bsd
+from glances.globals import BSD
 from glances.logger import logger
 from glances.plugins.glances_plugin import GlancesPlugin
 
 # XXX *BSDs: Segmentation fault (core dumped)
 # -- https://bitbucket.org/al45tair/netifaces/issues/15
-if not is_bsd:
+if not BSD:
     try:
         import netifaces
         netifaces_tag = True
diff --git a/glances/plugins/glances_processlist.py b/glances/plugins/glances_processlist.py
index 2d0be9a4..92516e02 100644
--- a/glances/plugins/glances_processlist.py
+++ b/glances/plugins/glances_processlist.py
@@ -24,7 +24,7 @@ import os
 from datetime import timedelta
 
 from glances.compat import iteritems
-from glances.globals import is_windows
+from glances.globals import WINDOWS
 from glances.logger import logger
 from glances.processes import glances_processes
 from glances.plugins.glances_core import Plugin as CorePlugin
@@ -224,8 +224,8 @@ class Plugin(GlancesPlugin):
             if nice is None:
                 nice = '?'
             msg = '{0:>5}'.format(nice)
-            if isinstance(nice, int) and ((is_windows and nice != 32) or
-                                          (not is_windows and nice != 0)):
+            if isinstance(nice, int) and ((WINDOWS and nice != 32) or
+                                          (not WINDOWS and nice != 0)):
                 ret.append(self.curse_add_line(msg, decoration='NICE'))
             else:
                 ret.append(self.curse_add_line(msg))
@@ -361,7 +361,7 @@ class Plugin(GlancesPlugin):
                 v = p['ionice'].ioclass
                 # Linux: The scheduling class. 0 for none, 1 for real time, 2 for best-effort, 3 for idle.
                 # Windows: On Windows only ioclass is used and it can be set to 2 (normal), 1 (low) or 0 (very low).
-                if is_windows:
+                if WINDOWS:
                     if v == 0:
                         msg += k + 'Very Low'
                     elif v == 1:
diff --git a/glances/processes.py b/glances/processes.py
index 9f2f1bd4..c7572831 100644
--- a/glances/processes.py
+++ b/glances/processes.py
@@ -22,7 +22,7 @@ import os
 import re
 
 from glances.compat import iteritems, itervalues
-from glances.globals import is_bsd, is_linux, is_mac, is_windows
+from glances.globals import BSD, LINUX, OSX, WINDOWS
 from glances.logger import logger
 from glances.timer import Timer, getTimeSinceLastUpdate
 
@@ -405,7 +405,7 @@ class GlancesProcesses(object):
         # If io_tag = 0 > Access denied (display "?")
         # If io_tag = 1 > No access denied (display the IO rate)
         # Note Disk IO stat not available on Mac OS
-        if not is_mac:
+        if not OSX:
             try:
                 # Get the process IO counters
                 proc_io = proc.io_counters()
@@ -513,7 +513,7 @@ class GlancesProcesses(object):
             procstat['num_threads'] = None
 
         # Number of handles (Windows only)
-        if is_windows:
+        if WINDOWS:
             try:
                 procstat.update(proc.as_dict(attrs=['num_handles']))
             except psutil.NoSuchProcess:
@@ -523,7 +523,7 @@ class GlancesProcesses(object):
 
         # SWAP memory (Only on Linux based OS)
         # http://www.cyberciti.biz/faq/linux-which-process-is-using-swap/
-        if is_linux:
+        if LINUX:
             try:
                 procstat['memory_swap'] = sum(
                     [v.swap for v in proc.memory_maps()])
@@ -545,7 +545,7 @@ class GlancesProcesses(object):
 
         # IO Nice
         # http://pythonhosted.org/psutil/#psutil.Process.ionice
-        if is_linux or is_windows:
+        if LINUX or WINDOWS:
             try:
                 procstat.update(proc.as_dict(attrs=['ionice']))
             except psutil.NoSuchProcess:
@@ -591,7 +591,7 @@ class GlancesProcesses(object):
         processdict = {}
         for proc in psutil.process_iter():
             # Ignore kernel threads if needed
-            if self.no_kernel_threads and not is_windows and is_kernel_thread(proc):
+            if self.no_kernel_threads and not WINDOWS and is_kernel_thread(proc):
                 continue
 
             # If self.max_processes is None: Only retreive mandatory stats
@@ -607,9 +607,9 @@ class GlancesProcesses(object):
             # ignore the 'idle' process on Windows and *BSD
             # ignore the 'kernel_task' process on OS X
             # waiting for upstream patch from psutil
-            if (is_bsd and processdict[proc]['name'] == 'idle' or
-                    is_windows and processdict[proc]['name'] == 'System Idle Process' or
-                    is_mac and processdict[proc]['name'] == 'kernel_task'):
+            if (BSD and processdict[proc]['name'] == 'idle' or
+                    WINDOWS and processdict[proc]['name'] == 'System Idle Process' or
+                    OSX and processdict[proc]['name'] == 'kernel_task'):
                 continue
             # Update processcount (global statistics)
             try:
diff --git a/glances/standalone.py b/glances/standalone.py
index 53e09963..5fc11e46 100644
--- a/glances/standalone.py
+++ b/glances/standalone.py
@@ -21,7 +21,7 @@
 
 from time import sleep
 
-from glances.globals import is_windows
+from glances.globals import WINDOWS
 from glances.logger import logger
 from glances.processes import glances_processes
 from glances.stats import GlancesStats
@@ -52,7 +52,7 @@ class GlancesStandalone(object):
         if args.process_filter is not None:
             glances_processes.process_filter = args.process_filter
 
-        if (not is_windows) and args.no_kernel_threads:
+        if (not WINDOWS) and args.no_kernel_threads:
             # Ignore kernel threads in process list
             glances_processes.disable_kernel_threads()
 
diff --git a/glances/webserver.py b/glances/webserver.py
index 5461e6a0..9852ae61 100644
--- a/glances/webserver.py
+++ b/glances/webserver.py
@@ -19,7 +19,7 @@
 
 """Glances Web Interface (Bottle based)."""
 
-from glances.globals import is_windows
+from glances.globals import WINDOWS
 from glances.processes import glances_processes
 from glances.stats import GlancesStats
 from glances.outputs.glances_bottle import GlancesBottle
@@ -33,7 +33,7 @@ class GlancesWebServer(object):
         # Init stats
         self.stats = GlancesStats(config)
 
-        if not is_windows and args.no_kernel_threads:
+        if not WINDOWS and args.no_kernel_threads:
             # Ignore kernel threads in process list
             glances_processes.disable_kernel_threads()