From bf17d968008addadfb06fe35e83ac9de38ba2af4 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Mon, 25 Jul 2016 15:02:03 -0700 Subject: [PATCH] Use extract_swift_bytes in override_bytes_from_content_type About half the logic was the same, and it seems better to just implement that once. Change-Id: I350da34ef7a3cd0cb74f585f4691992ae64c7eab --- swift/common/utils.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/swift/common/utils.py b/swift/common/utils.py index 7822363e29..cedafecef4 100644 --- a/swift/common/utils.py +++ b/swift/common/utils.py @@ -3429,17 +3429,14 @@ def override_bytes_from_content_type(listing_dict, logger=None): Takes a dict from a container listing and overrides the content_type, bytes fields if swift_bytes is set. """ - content_type, params = parse_content_type(listing_dict['content_type']) - for key, value in params: - if key == 'swift_bytes': - try: - listing_dict['bytes'] = int(value) - except ValueError: - if logger: - logger.exception("Invalid swift_bytes") - else: - content_type += ';%s=%s' % (key, value) - listing_dict['content_type'] = content_type + listing_dict['content_type'], swift_bytes = extract_swift_bytes( + listing_dict['content_type']) + if swift_bytes is not None: + try: + listing_dict['bytes'] = int(swift_bytes) + except ValueError: + if logger: + logger.exception("Invalid swift_bytes") def clean_content_type(value):