From 4728ee20e890a9e479961968242ecf10dcfd9f8c Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 13 May 2025 15:35:31 -0700 Subject: [PATCH] reverting pr 2484 because it breaks personalization --- app/s3_client/s3_csv_client.py | 9 --------- tests/app/s3_client/test_s3_csv_client.py | 10 +--------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/app/s3_client/s3_csv_client.py b/app/s3_client/s3_csv_client.py index 4d8f33a07..195ea3032 100644 --- a/app/s3_client/s3_csv_client.py +++ b/app/s3_client/s3_csv_client.py @@ -28,17 +28,8 @@ def get_csv_upload(service_id, upload_id): return get_s3_object(*get_csv_location(service_id, upload_id)) -def remove_blank_lines(filedata): - # sometimes people upload files with hundreds of blank lines at the end - data = filedata["data"] - cleaned_data = "\n".join(line for line in data.splitlines() if line.strip()) - filedata["data"] = cleaned_data - return filedata - - def s3upload(service_id, filedata): - filedata = remove_blank_lines(filedata) upload_id = str(uuid.uuid4()) bucket_name, file_location, access_key, secret_key, region = get_csv_location( service_id, upload_id diff --git a/tests/app/s3_client/test_s3_csv_client.py b/tests/app/s3_client/test_s3_csv_client.py index 2ea3c43db..dbf26ea47 100644 --- a/tests/app/s3_client/test_s3_csv_client.py +++ b/tests/app/s3_client/test_s3_csv_client.py @@ -1,6 +1,6 @@ from unittest.mock import Mock -from app.s3_client.s3_csv_client import remove_blank_lines, set_metadata_on_csv_upload +from app.s3_client.s3_csv_client import set_metadata_on_csv_upload def test_sets_metadata(client_request, mocker): @@ -21,11 +21,3 @@ def test_sets_metadata(client_request, mocker): MetadataDirective="REPLACE", ServerSideEncryption="AES256", ) - - -def test_removes_blank_lines(): - filedata = { - "data": "phone number\r\n15555555555\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n" - } - file_data = remove_blank_lines(filedata) - assert file_data == {"data": "phone number\n15555555555"}