Skip to content

fix python3 sys.exit import #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chytacmotylu wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix python3 sys.exit import #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
205ee08
update .gitignore
chytacmotylu Jan 30, 2019
3b67e86
fix python3 import
chytacmotylu Jan 30, 2019
7729a81
python3 fix
chytacmotylu Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ build/
dist/
macli.spec
venv/

*.pyc
6 changes: 4 additions & 2 deletions api_cadvisor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -48,7 +50,7 @@ def get_cpu_usage(self):
# self.req_data(url)


class Cadvisor:
class Cadvisor(object):
url = ""
machine = {}
host = CadvisorContainer()
Expand Down
7 changes: 5 additions & 2 deletions macli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/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
from marathon.exceptions import *
Expand All @@ -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)

Expand Down