Merge branch 'sneakypete81-pylint' into development

This commit is contained in:
sneakypete81 2014-04-12 21:58:22 +01:00
commit 5c595aa177

View file

@ -2,6 +2,7 @@
""" """
main.py : Trovebox Console Script main.py : Trovebox Console Script
""" """
from __future__ import print_function
import os import os
import sys import sys
import json import json
@ -105,7 +106,7 @@ def main(args=sys.argv[1:]):
if options.pretty: if options.pretty:
print(json.dumps(json.loads(result), sort_keys=True, print(json.dumps(json.loads(result), sort_keys=True,
indent=4, separators=(',',':'))) indent=4, separators=(',', ':')))
else: else:
print(result) print(result)