diff options
Diffstat (limited to 'glances/__init__.py')
| -rw-r--r-- | glances/__init__.py | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/glances/__init__.py b/glances/__init__.py index 96467d73..c937e820 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -16,20 +16,21 @@ # # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +# """Init the Glances software.""" -__appname__ = 'glances' -__version__ = '2.5.1' -__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>' -__license__ = 'LGPL' - -# Import system lib import locale import platform import signal import sys +# Global name +__appname__ = 'glances' +__version__ = '2.6' +__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>' +__license__ = 'LGPL' + # Import psutil try: from psutil import __version__ as __psutil_version @@ -39,8 +40,8 @@ except ImportError: # Import Glances libs # Note: others Glances libs will be imported optionally -from glances.core.glances_logging import logger -from glances.core.glances_main import GlancesMain +from glances.logger import logger +from glances.main import GlancesMain try: locale.setlocale(locale.LC_ALL, '') @@ -52,6 +53,13 @@ if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 3): print('Glances requires at least Python 2.6 or 3.3 to run.') sys.exit(1) +if sys.version_info[:2] == (2, 6): + import warnings + warnings.warn('Python 2.6 support will be dropped. Please switch ' + 'to at least Python 2.7 or 3.3+ as soon as possible. ' + 'See http://www.snarky.ca/stop-using-python-2-6 ' + 'for more information.') + # Check PSutil version psutil_min_version = (2, 0, 0) psutil_version = tuple([int(num) for num in __psutil_version.split('.')]) @@ -115,7 +123,7 @@ def main(): logger.info("Start standalone mode") # Import the Glances standalone module - from glances.core.glances_standalone import GlancesStandalone + from glances.standalone import GlancesStandalone # Init the standalone mode standalone = GlancesStandalone(config=core.get_config(), @@ -129,7 +137,7 @@ def main(): logger.info("Start client mode (browser)") # Import the Glances client browser module - from glances.core.glances_client_browser import GlancesClientBrowser + from glances.client_browser import GlancesClientBrowser # Init the client client = GlancesClientBrowser(config=core.get_config(), @@ -139,7 +147,7 @@ def main(): logger.info("Start client mode") # Import the Glances client module - from glances.core.glances_client import GlancesClient + from glances.client import GlancesClient # Init the client client = GlancesClient(config=core.get_config(), @@ -160,7 +168,7 @@ def main(): logger.info("Start server mode") # Import the Glances server module - from glances.core.glances_server import GlancesServer + from glances.server import GlancesServer args = core.get_args() @@ -183,7 +191,7 @@ def main(): logger.info("Start web server mode") # Import the Glances web server module - from glances.core.glances_webserver import GlancesWebServer + from glances.webserver import GlancesWebServer # Init the web server mode webserver = GlancesWebServer(config=core.get_config(), |