Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Selected yaml.Loader while reading odml documents #344

Merged
merged 3 commits into from
Jan 17, 2020
Merged

Selected yaml.Loader while reading odml documents #344

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6300b0
Selected yaml.Loader while reading odml documents
Aniket-Pradhan Jan 4, 2020
cf22795
Use SafeLoader instead of Loader to load yaml files
Aniket-Pradhan Jan 16, 2020
48e55a2
Added a method to serialize datetime.time objects as string objects
Aniket-Pradhan Jan 16, 2020
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
19 changes: 17 additions & 2 deletions odml/tools/odmlparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ def to_string(self, odml_document):
'odml-version': FORMAT_VERSION}

if self.parser == 'YAML':
yaml.add_representer(datetime.time, YAMLTimeSerializer)
string_doc = yaml.dump(odml_output, default_flow_style=False)
elif self.parser == 'JSON':
string_doc = json.dumps(odml_output, indent=4,
Expand All @@ -88,6 +89,11 @@ def to_string(self, odml_document):
return string_doc


# Required to serialize datetime.time as string objects
def YAMLTimeSerializer(dumper, data):
return dumper.represent_scalar('tag:yaml.org,2002:str', str(data))


# Required to serialize datetime values with JSON.
class JSONDateTimeSerializer(json.JSONEncoder):
def default(self, o):
Expand Down Expand Up @@ -133,7 +139,10 @@ def from_file(self, file, doc_format=None):
elif self.parser == 'YAML':
with open(file) as yaml_data:
try:
self.parsed_doc = yaml.load(yaml_data)
yaml.SafeLoader.add_constructor(
"tag:yaml.org,2002:python/unicode",
UnicodeLoaderConstructor)
self.parsed_doc = yaml.safe_load(yaml_data)
except yaml.parser.ParserError as err:
print(err)
return
Expand Down Expand Up @@ -173,7 +182,7 @@ def from_string(self, string, doc_format=None):

elif self.parser == 'YAML':
try:
self.parsed_doc = yaml.load(string)
self.parsed_doc = yaml.safe_load(string)
except yaml.parser.ParserError as err:
print(err)
return
Expand All @@ -197,3 +206,9 @@ def from_string(self, string, doc_format=None):

self.doc = RDFReader().from_string(string, doc_format)
return self.doc


# Constructor for PyYAML to load unicode characters
# Needed only for < Python 3
def UnicodeLoaderConstructor(loader, node):
return node.value