Remove PackageID::contents_key

4 files changed, 0 insertions, 38 deletions

diff --git a/python/additional_tests.cc b/python/additional_tests.cc
index 8f81263cf..f95492ff8 100644
--- a/python/additional_tests.cc
+++ b/python/additional_tests.cc
@@ -154,12 +154,6 @@ namespace metadata_key
         Timestamp PALUDIS_ATTRIBUTE((unused)) t(m.parse_value());
     }
 
-    void test_metadata_contents_key(const MetadataValueKey<std::shared_ptr<const Contents> > & m)
-    {
-        test_metadata_key(m);
-        m.parse_value();
-    }
-
     void test_metadata_choices_key(const MetadataValueKey<std::shared_ptr<const Choices> > & m)
     {
         test_metadata_key(m);
@@ -210,7 +204,6 @@ void expose_additional_tests()
     bp::def("test_metadata_package_id_key", &metadata_key::test_metadata_package_id_key);
     bp::def("test_metadata_string_key", &metadata_key::test_metadata_string_key);
     bp::def("test_metadata_time_key", &metadata_key::test_metadata_time_key);
-    bp::def("test_metadata_contents_key", &metadata_key::test_metadata_contents_key);
     bp::def("test_metadata_choices_key", &metadata_key::test_metadata_choices_key);
     bp::def("test_metadata_keyword_name_set_key", &metadata_key::test_metadata_set_key<KeywordNameSet>);
     bp::def("test_metadata_string_set_key", &metadata_key::test_metadata_set_key<Set<std::string> >);
diff --git a/python/metadata_key_TEST.py b/python/metadata_key_TEST.py
index a8ab3812d..7f0ba0468 100755
--- a/python/metadata_key_TEST.py
+++ b/python/metadata_key_TEST.py
@@ -126,26 +126,6 @@ class TestCase_02_MetadataKeys_suclassing(unittest.TestCase):
 
         test_metadata_time_key(TestKey())
 
-
-    def test_04_contents(self):
-        class TestKey(MetadataContentsKey):
-            def __init__(self):
-                MetadataContentsKey.__init__(self)
-
-            def parse_value(self):
-                return Contents()
-
-            def raw_name(self):
-                return "raw"
-
-            def human_name(self):
-                return "human"
-
-            def type(self):
-                return MetadataKeyType.NORMAL
-
-        test_metadata_contents_key(TestKey())
-
     def test_06_keyword_name_iterable(self):
         class TestKey(MetadataKeywordNameIterableKey):
             def __init__(self):
diff --git a/python/package_id.cc b/python/package_id.cc
index 9f84efd4c..19fb03e98 100644
--- a/python/package_id.cc
+++ b/python/package_id.cc
@@ -148,13 +148,6 @@ void expose_package_id()
                 "description of a package."
             )
 
-        .def("contents_key", &PackageID::contents_key,
-                "The contents_key, if not None, contains the contents of a\n"
-                "package. For installed packages, this means the files installed;\n"
-                "for installable packages, this means the files that will be\n"
-                "installed (if known, which it may be for some binary packages)."
-            )
-
         .def("installed_time_key", &PackageID::installed_time_key,
                 "The installed_time_key, if not None, contains the time a package\n"
                 "was installed. It affects dependency resolution if DepList is\n"
diff --git a/python/package_id_TEST.py b/python/package_id_TEST.py
index 68b52b45e..129571bb5 100755
--- a/python/package_id_TEST.py
+++ b/python/package_id_TEST.py
@@ -133,10 +133,6 @@ class TestCase_01_PackageID(unittest.TestCase):
         self.assertEquals(self.pid.long_description_key(), None)
         self.assertEquals(self.ipid.long_description_key(), None)
 
-    def test_26_contents_key(self):
-        self.assertEquals(self.pid.contents_key(), None)
-        self.assert_(isinstance(self.ipid.contents_key(), MetadataContentsKey))
-
     def test_27_installed_time_key(self):
         self.assertEquals(self.pid.installed_time_key(), None)
         self.assert_(isinstance(self.ipid.installed_time_key(), MetadataTimeKey))