- #for header in gopts.remove_all_params:
- # value = msg[header]
- # if value is None: # No such header
- # continue
- # if ';' not in value: # There are no parameters
- # continue
- # del msg[header] # Delete all such headers
- # # Get the value without parameters and set it back
- # msg[header] = value.split(';')[0].strip()
-
- for header, param in gopts.remove_header_params:
- msg.del_param(param, header)
+ for header_list, param_list in gopts.remove_headers_params:
+ header_list = header_list.split(',')
+ param_list = param_list.split(',')
+ remove_all_params = param_list[0] == '*' # Remove all params except listed
+ if remove_all_params:
+ param_list = _get_exceptions(param_list)
+ if header_list[0] == '*': # Remove for all headers except listed
+ header_list = _get_exceptions(header_list)
+ for header in msg.keys():
+ if header.lower() not in header_list:
+ _remove_headers_params(msg, header, remove_all_params, param_list)
+ else: # Decode for listed headers
+ for header in header_list:
+ _remove_headers_params(msg, header, remove_all_params, param_list)