From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH] emlcontentfoo: drop the {discrete} and {composite} fields
Date: Sun, 10 May 2020 09:42:02 +0000 [thread overview]
Message-ID: <20200510094202.30177-1-e@yhbt.net> (raw)
We don't have to worry about compatibility with old
installations of Email::MIME::ContentType any longer,
so save some space.
---
lib/PublicInbox/EmlContentFoo.pm | 10 ----------
lib/PublicInbox/WwwAttach.pm | 3 +--
t/eml_content_type.t | 4 ----
3 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/lib/PublicInbox/EmlContentFoo.pm b/lib/PublicInbox/EmlContentFoo.pm
index e6005d290c9..c163eaf5183 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 754da13ffde..7e8496d7ab9 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 5fd7d1d98c4..5acd51ad747 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;
reply other threads:[~2020-05-10 9:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200510094202.30177-1-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).