Skip to content

Commit

Permalink
Merge branch 'issue-137' into papercuts
Browse files Browse the repository at this point in the history
  • Loading branch information
aalba6675 committed Jan 15, 2018
2 parents af29615 + 89da661 commit 4e39ac5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pyhocon/config_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def parse_string(content, basedir=None, resolve=True):
return ConfigParser().parse(content, basedir, resolve)

@classmethod
def from_dict(cls, dictionary):
def from_dict(cls, dictionary, root=False):
"""Convert dictionary (and ordered dictionary) into a ConfigTree
:param dictionary: dictionary to convert
:type dictionary: dict
Expand All @@ -104,7 +104,7 @@ def from_dict(cls, dictionary):

def create_tree(value):
if isinstance(value, dict):
res = ConfigTree()
res = ConfigTree(root = root)
for key, child_value in value.items():
res.put(key, create_tree(child_value))
return res
Expand Down

0 comments on commit 4e39ac5

Please sign in to comment.