diff options
author | Eric Wong <e@yhbt.net> | 2020-05-10 09:42:02 +0000 |
---|---|---|
committer | Eric Wong <e@yhbt.net> | 2020-05-10 19:43:46 +0000 |
commit | a91871ec6b607d73502ee447af8ccc9e4bfe5098 (patch) | |
tree | 8c13d93fc9e96eb9ff97090be24fb18cf160ef93 | |
parent | 9ab3c55b283b0cc1b4298fc95439cc1dfae14305 (diff) | |
download | public-inbox-a91871ec6b607d73502ee447af8ccc9e4bfe5098.tar.gz |
We don't have to worry about compatibility with old installations of Email::MIME::ContentType any longer, so save some space.
-rw-r--r-- | lib/PublicInbox/EmlContentFoo.pm | 10 | ||||
-rw-r--r-- | lib/PublicInbox/WwwAttach.pm | 3 | ||||
-rw-r--r-- | t/eml_content_type.t | 4 |
3 files changed, 1 insertions, 16 deletions
diff --git a/lib/PublicInbox/EmlContentFoo.pm b/lib/PublicInbox/EmlContentFoo.pm index e6005d29..c163eaf5 100644 --- a/lib/PublicInbox/EmlContentFoo.pm +++ b/lib/PublicInbox/EmlContentFoo.pm @@ -102,11 +102,6 @@ sub parse_content_type { type => $type, subtype => $subtype, attributes => $attributes, - - # This is dumb. Really really dumb. For backcompat. -- rjbs, - # 2013-08-10 - discrete => $type, - composite => $subtype, }; } @@ -301,11 +296,6 @@ This routine parses email content type headers according to section 5.1 of RFC a hash as above, with entries for the C<type>, the C<subtype>, and a hash of C<attributes>. -For backward compatibility with a really unfortunate misunderstanding of RFC -2045 by the early implementors of this module, C<discrete> and C<composite> are -also present in the returned hashref, with the values of C<type> and C<subtype> -respectively. - =func parse_content_disposition This routine is exported by default. diff --git a/lib/PublicInbox/WwwAttach.pm b/lib/PublicInbox/WwwAttach.pm index 754da13f..7e8496d7 100644 --- a/lib/PublicInbox/WwwAttach.pm +++ b/lib/PublicInbox/WwwAttach.pm @@ -17,8 +17,7 @@ sub get_attach_i { # ->each_part callback my $ct = $part->content_type; $ct = parse_content_type($ct) if $ct; - # discrete == type, we remain Debian wheezy-compatible - if ($ct && (($ct->{discrete} || '') eq 'text')) { + if ($ct && (($ct->{type} || '') eq 'text')) { # display all text as text/plain: my $cset = $ct->{attributes}->{charset}; if ($cset && ($cset =~ /\A[a-zA-Z0-9_\-]+\z/)) { diff --git a/t/eml_content_type.t b/t/eml_content_type.t index 5fd7d1d9..5acd51ad 100644 --- a/t/eml_content_type.t +++ b/t/eml_content_type.t @@ -260,10 +260,6 @@ my %non_strict_ct_tests = ( sub test { my ($string, $expect, $info) = @_; - # So stupid. -- rjbs, 2013-08-10 - $expect->{discrete} = $expect->{type}; - $expect->{composite} = $expect->{subtype}; - local $_; $info =~ s/\r/\\r/g; $info =~ s/\n/\\n/g; |