Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions json_include.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,15 @@ def read_file(filepath):
return f.read()


def is_string(obj):
try:
return isinstance(obj, basestring)
except NameError:
return isinstance(obj, str)


def get_include_name(value):
if isinstance(value, basestring):
if is_string(value):
rv = INCLUDE_VALUE_PATTERN.search(value)
if rv:
return rv.groups()[0]
Expand All @@ -34,7 +41,7 @@ def walk_through_to_include(o, dirpath):
if isinstance(o, dict):
is_include_exp = False
if set(o) == set([INCLUDE_KEY]):
include_name = get_include_name(o.values()[0])
include_name = get_include_name(list(o.values())[0])
if include_name:
is_include_exp = True
o.clear()
Expand All @@ -45,7 +52,7 @@ def walk_through_to_include(o, dirpath):
if is_include_exp:
return

for k, v in o.iteritems():
for k, v in o.items():
if isinstance(v, OBJECT_TYPES):
walk_through_to_include(v, dirpath)
elif isinstance(o, list):
Expand Down Expand Up @@ -113,7 +120,7 @@ def main():

args = parser.parse_args()

print build_json_include(args.dirpath, args.filename)
print(build_json_include(args.dirpath, args.filename))


if __name__ == '__main__':
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


# Use semantic versioning: MAJOR.MINOR.PATCH
version = '0.1.4'
version = '0.1.5'


def get_requires():
Expand Down
2 changes: 1 addition & 1 deletion test/json_include_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ def test_build_json_include():
def run_build_json_include(dirpath, i):
rv = build_json_include(dirpath, i)
expect = read_file(os.path.join(_path('expect'), i))
print rv
print(rv)
assert rv.strip() == expect.strip()