From 8a33ff96ded3f94857e618daaa02908e3ba31aa1 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby <nicolas@nexedi.com> Date: Fri, 14 May 2010 13:22:49 +0000 Subject: [PATCH] Code optimisation, thanks Luke git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35346 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/Document/EmailDocument.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/product/ERP5/Document/EmailDocument.py b/product/ERP5/Document/EmailDocument.py index de9a8d8413..1c0c570f7d 100644 --- a/product/ERP5/Document/EmailDocument.py +++ b/product/ERP5/Document/EmailDocument.py @@ -238,12 +238,8 @@ class EmailDocument(TextDocument): # get_filename return name only from Content-Disposition header # of the message but sometimes this value is stored in # Content-Type header - if 'Content-Type' in kw: - content_type_header = kw['Content-Type'] - elif 'Content-type' in kw: - content_type_header = kw['Content-type'] - else: - content_type_header = '' + content_type_header = kw.get('Content-Type', + kw.get('Content-type', '')) file_name_list = re.findall(file_name_regexp, content_type_header, re.MULTILINE) @@ -252,12 +248,9 @@ class EmailDocument(TextDocument): if file_name: kw['file_name'] = file_name else: - content_disposition = None + content_disposition = kw.get('Content-Disposition', + kw.get('Content-disposition'), None) prefix = 'part_' - if 'Content-Disposition' in kw: - content_disposition = kw['Content-Disposition'] - elif 'Content-disposition' in kw: - content_disposition = kw['Content-disposition'] if content_disposition: if content_disposition.split(';')[0] == 'attachment': prefix = 'attachment_' @@ -285,10 +278,8 @@ class EmailDocument(TextDocument): # get_filename return name only from Content-Disposition header # of the message but sometimes this value is stored in # Content-Type header - if 'Content-Type' in kw: - content_type_header = kw['Content-Type'] - elif 'Content-type' in kw: - content_type_header = kw['Content-Type'] + content_type_header = kw.get('Content-Type', + kw.get('Content-type', '')) file_name_list = re.findall(file_name_regexp, content_type_header, re.MULTILINE) -- 2.30.9