te32
/
SublimePrettyJson
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pep8 small fixes and fixing jQ to work on SublimeText 2. Definition of show_input_panel was wrong

This commit is contained in:
Nikolajus 2014-06-04 17:03:58 +02:00 committed by Nikolajus Krauklis
parent 890459dc5d
commit 426aaab847
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PrettyJson.py
View File

@ -4,18 +4,20 @@ import decimal
import sys
import os
import re
import xml.etree.ElementTree as ET
from xml.etree import ElementTree
from xml.dom import minidom
try:
# python 3 / Sublime Text 3
from . import simplejson as json
from .simplejson import OrderedDict
except (ValueError):
except ValueError:
# python 2 / Sublime Text 2
import simplejson as json
from simplejson import OrderedDict
SUBLIME_MAJOR_VERSION = int(sublime.version()) / 1000
jq_exits = False
jq_version = None
@ -136,7 +138,7 @@ class JqPrettyJson(sublime_plugin.WindowCommand):
"""
def run(self):
if jq_exits:
self.window.show_input_panel("Enter ./jq filter expression", ".", on_done=self.done, on_change=None, on_cancel=None)
self.window.show_input_panel("Enter ./jq filter expression", ".", self.done, None, None)
else:
sublime.status_message("./jq tool is not available on your system. http://stedolan.github.io/jq")
@ -158,7 +160,11 @@ class JqPrettyJson(sublime_plugin.WindowCommand):
try:
p = subprocess.Popen(["jq", query], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
raw_json = self.get_content()
out, err = p.communicate(bytes(raw_json, "utf-8"))
if SUBLIME_MAJOR_VERSION < 3:
out, err = p.communicate(bytes(raw_json))
else:
out, err = p.communicate(bytes(raw_json, "utf-8"))
output = out.decode("UTF-8").strip()
if output:
view = self.window.new_file()
@ -190,11 +196,11 @@ class JsonToXml(PrettyJsonCommand):
try:
h = json.loads(self.view.substr(selection))
root = ET.Element("root")
root = ElementTree.Element("root")
root = self.traverse(root, h)
xml_string = "<?xml version='1.0' encoding='UTF-8' ?>"
rtn = ET.tostring(root, "utf-8", "xml")
rtn = ElementTree.tostring(root, "utf-8", "xml")
if type(rtn) is bytes:
rtn = rtn.decode("utf-8")
@ -219,12 +225,12 @@ class JsonToXml(PrettyJsonCommand):
def traverse(self, el, ha):
if type(ha) is dict and ha.keys():
for i in ha.keys():
e = ET.Element(i)
e = ElementTree.Element(i)
el.append(self.traverse(e, ha[i]))
elif type(ha) is list:
e_items = ET.Element('items')
e_items = ElementTree.Element('items')
for i in ha:
e_items.append(self.traverse(ET.Element('item'), i))
e_items.append(self.traverse(ElementTree.Element('item'), i))
el.append(e_items)
else:
el.set('value', str(ha))

25
tests/tests.py
View File

@ -12,7 +12,6 @@ import unittest
class TestIssues(unittest.TestCase):
def setUp(self):
pass
@ -23,8 +22,8 @@ class TestIssues(unittest.TestCase):
}'''
obj = json.loads(tmp_str, object_pairs_hook=OrderedDict, parse_float=decimal.Decimal)
tmp_str = json.dumps(obj, indent=2, ensure_ascii=True, sort_keys=False,
separators=(',', ': '),
use_decimal=True)
separators=(',', ': '),
use_decimal=True)
self.assertEqual(tmp_str, expected_output)
# issue 15
@ -35,8 +34,8 @@ class TestIssues(unittest.TestCase):
}"""
obj = json.loads(tmp_str, object_pairs_hook=OrderedDict, parse_float=decimal.Decimal)
tmp_str = json.dumps(obj, indent=2, ensure_ascii=False, sort_keys=False,
separators=(',', ': '),
use_decimal=True)
separators=(',', ': '),
use_decimal=True)
self.assertEqual(tmp_str, expected_output)
# issue 16
@ -45,13 +44,14 @@ class TestIssues(unittest.TestCase):
obj = json.loads(tmp_str, object_pairs_hook=OrderedDict, parse_float=decimal.Decimal)
self.assertEqual(obj['float'], 1.0)
tmp_str = json.dumps(obj, indent=0, ensure_ascii=False, sort_keys=False,
separators=(',', ': '),
use_decimal=True)
separators=(',', ': '),
use_decimal=True)
self.assertEqual(tmp_str.split('\n')[1], '"float": 1.0')
# issue 16
def test_float_issue_16_2(self):
tmp_str = '{"test1":0.99, "test2":"1.99", "test3":1.00000000001, "test4":1.99, "test5":1, "test6":4.589999999999999999, "test7":1.0}'
tmp_str = '{"test1":0.99, "test2":"1.99", "test3":1.00000000001, "test4":1.99, "test5":1,' \
' "test6":4.589999999999999999, "test7":1.0}'
expected_output = """{
"test1": 0.99,
"test2": "1.99",
@ -63,8 +63,8 @@ class TestIssues(unittest.TestCase):
}"""
obj = json.loads(tmp_str, object_pairs_hook=OrderedDict, parse_float=decimal.Decimal)
tmp_str = json.dumps(obj, indent=2, ensure_ascii=False, sort_keys=False,
separators=(',', ': '),
use_decimal=True)
separators=(',', ': '),
use_decimal=True)
self.assertEqual(tmp_str, expected_output)
def test_compress_feature(self):
@ -74,11 +74,10 @@ class TestIssues(unittest.TestCase):
expected_output = '{"real":0.99}'
obj = json.loads(tmp_str, object_pairs_hook=OrderedDict, parse_float=decimal.Decimal)
tmp_str = json.dumps(obj, ensure_ascii=False, sort_keys=False,
separators=(',', ':'),
use_decimal=True)
separators=(',', ':'),
use_decimal=True)
self.assertEqual(tmp_str, expected_output)
if __name__ == '__main__':
unittest.main()