From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@yhbt.net>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id ADDFC1F55B
	for <meta@public-inbox.org>; Sun, 10 May 2020 09:42:02 +0000 (UTC)
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
Message-Id: <20200510094202.30177-1-e@yhbt.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

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;