Skip to content

Always enforce utf-8 encoding. #442

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2021
Merged

Always enforce utf-8 encoding. #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cob_datapipeline/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ def cleanup_metadata(**op_kwargs):

etree.cleanup_namespaces(collection)
filename = s3_key.replace(source_prefix, dest_prefix)
transformed_xml = etree.tostring(collection)
transformed_xml = etree.tostring(collection, encoding="utf-8")
process.generate_s3_object(transformed_xml, bucket, filename, access_id, access_secret)
8 changes: 4 additions & 4 deletions cob_datapipeline/tasks/xml_parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ def boundwith_record_process(record, lookup_csv):
parent_xml_str = b""
for parent_xml_item in parent_xml_items:
if parent_xml_item is not None:
parent_xml_str = etree.tostring(parent_xml_item) + b"||"
parent_xml_str = etree.tostring(parent_xml_item, encoding="utf-8") + b"||"
for parent_xml_hldg in parent_xml_hldgs:
if parent_xml_hldg is not None:
parent_xml_str += etree.tostring(parent_xml_hldg) + b"||"
parent_xml_str += etree.tostring(parent_xml_new_field)
parent_xml_str += etree.tostring(parent_xml_hldg, encoding="utf-8") + b"||"
parent_xml_str += etree.tostring(parent_xml_new_field, encoding="utf-8")
parent_xml_str = parent_xml_str.rstrip()
# Gather Children Identifiers, Verify they are MMS Identifiers, & Add to Lookup
children_ids = record.xpath(
Expand Down Expand Up @@ -166,7 +166,7 @@ def prepare_alma_data(**kwargs):
logging.error(parent_node)
dest_key = key.replace(src_suffix, "").replace(src_prefix, dest_prefix + "/alma_bibs__")
process.generate_s3_object(
etree.tostring(src_xml),
etree.tostring(src_xml, encoding="utf-8"),
bucket,
dest_key,
access_id,
Expand Down