From 205ee08932f597d95d2464777cd423b9621b2b02 Mon Sep 17 00:00:00 2001 From: motylovac Date: Wed, 30 Jan 2019 12:40:23 +0100 Subject: [PATCH 1/3] update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 224d084..d19c907 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ build/ dist/ macli.spec venv/ - +*.pyc From 3b67e86b3f08d0ee25015caf5527797d747db6ab Mon Sep 17 00:00:00 2001 From: motylovac Date: Wed, 30 Jan 2019 12:40:50 +0100 Subject: [PATCH 2/3] fix python3 import --- macli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macli.py b/macli.py index 5c6d16a..98c4021 100755 --- a/macli.py +++ b/macli.py @@ -1,5 +1,5 @@ #!/usr/bin/python - +from sys import exit from os import environ from marathon import MarathonClient, MarathonApp from marathon.exceptions import * From 7729a81ee4ef5315c90cfb90ca261d143165f65c Mon Sep 17 00:00:00 2001 From: motylovac Date: Wed, 30 Jan 2019 13:38:01 +0100 Subject: [PATCH 3/3] python3 fix --- api_cadvisor.py | 6 ++++-- macli.py | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/api_cadvisor.py b/api_cadvisor.py index 52d99a8..31ff8ec 100755 --- a/api_cadvisor.py +++ b/api_cadvisor.py @@ -1,12 +1,14 @@ #!/usr/bin/python +from builtins import str +from builtins import object import requests import json import dateutil.parser import pprint -class CadvisorContainer: +class CadvisorContainer(object): data = {} mesos_id = "" cpu_usage = 0.0 @@ -48,7 +50,7 @@ def get_cpu_usage(self): # self.req_data(url) -class Cadvisor: +class Cadvisor(object): url = "" machine = {} host = CadvisorContainer() diff --git a/macli.py b/macli.py index 98c4021..4ed5785 100755 --- a/macli.py +++ b/macli.py @@ -1,4 +1,6 @@ #!/usr/bin/python +from __future__ import print_function +from builtins import str from sys import exit from os import environ from marathon import MarathonClient, MarathonApp @@ -14,8 +16,9 @@ class mPrinter(pprint.PrettyPrinter): def format(self, object, context, maxlevels, level): - if isinstance(object, unicode): + if isinstance(object, bytes): return (object.encode('utf8'), True, False) + return pprint.PrettyPrinter.format(self, object, context, maxlevels, level)