Nothing uses default_destinations now

4 files changed, 0 insertions, 46 deletions

diff --git a/python/additional_tests.cc b/python/additional_tests.cc
index b3ca31633..fc1d5bff4 100644
--- a/python/additional_tests.cc
+++ b/python/additional_tests.cc
@@ -88,8 +88,6 @@ namespace environment
 
         e.set(SetName("set"));
 
-        e.default_destinations();
-
         e.perform_hook(Hook("test"), make_null_shared_ptr());
 
         e.distribution();
diff --git a/python/environment.cc b/python/environment.cc
index 1a0d3f80a..5e5bd3c0a 100644
--- a/python/environment.cc
+++ b/python/environment.cc
@@ -275,22 +275,6 @@ class EnvironmentImplementationWrapper :
             return EnvironmentImplementation::set(s);
         }
 
-        virtual std::shared_ptr<const DestinationsSet> default_destinations() const
-            PALUDIS_ATTRIBUTE((warn_unused_result))
-        {
-            Lock l(get_mutex());
-
-            if (bp::override f = get_override("default_destinations"))
-                return f();
-            return EnvironmentImplementation::default_destinations();
-        }
-
-        std::shared_ptr<const DestinationsSet> default_default_destinations() const
-            PALUDIS_ATTRIBUTE((warn_unused_result))
-        {
-            return EnvironmentImplementation::default_destinations();
-        }
-
         // FIXME - Hooks are not exposed
         virtual HookResult perform_hook(const Hook & h, const std::shared_ptr<OutputManager> &) const
             PALUDIS_ATTRIBUTE((warn_unused_result))
@@ -544,11 +528,6 @@ void expose_environment()
          "and provides various methods for querying package visibility and options.",
          bp::no_init
         )
-        .add_property("default_destinations", &Environment::default_destinations,
-                "[ro] DestinationsIterable\n"
-                "Default destination candidates for installing packages."
-            )
-
         .add_property("package_database", bp::make_function(package_database,
                     bp::with_custodian_and_ward_postcall<0, 1>()),
                 "[ro] PackageDatabase\n"
@@ -674,11 +653,6 @@ void expose_environment()
                 "If the named set is not known, returns None."
             )
 
-        .def("default_destinations", &EnvImp::default_destinations, &EnvImpW::default_default_destinations,
-                "default_destinations() -> list of Repository\n"
-                "Default destination candidates for installing packages."
-            )
-
         .def("distribution", &EnvImp::distribution, &EnvImpW::default_distribution,
                 "distribution() -> str\n"
                 "NEED_DOC"
diff --git a/python/environment_TEST.py b/python/environment_TEST.py
index 59a8bc516..8b94905af 100755
--- a/python/environment_TEST.py
+++ b/python/environment_TEST.py
@@ -70,10 +70,6 @@ class TestCase_01_Environments(unittest.TestCase):
         self.assert_(isinstance(nce2.main_repository, Repository))
         self.assert_(isinstance(nce2.master_repository, Repository))
 
-    def test_10_default_destinations(self):
-        self.assert_(isinstance(self.e.default_destinations, DestinationsIterable))
-        self.assert_(isinstance(self.nce.default_destinations, DestinationsIterable))
-
     def test_11_set_accept_unstable(self):
         self.nce.accept_unstable = True
         self.assertRaises(AttributeError, lambda: self.nce.accept_unstable)
@@ -138,10 +134,6 @@ class TestCase_04_Environment_subclassingd(unittest.TestCase):
         def set(self, set):
             return AllDepSpec()
 
-        def default_destinations(self):
-            e = EnvironmentFactory.instance.create("")
-            return [x for x in e.package_database.repositories]
-
         def distribution(self):
             return EnvironmentImplementation.distribution(self)
 
diff --git a/python/repository.cc b/python/repository.cc
index 5fd1961c1..bbcce3862 100644
--- a/python/repository.cc
+++ b/python/repository.cc
@@ -116,16 +116,6 @@ namespace
 void expose_repository()
 {
     /**
-     * DestinationIterable
-     */
-    class_iterable<DestinationsSet>
-        (
-         "DestinationsIterable",
-         "Iterable of Repository.",
-         true
-        );
-
-    /**
      * Repository
      */
     register_shared_ptrs_to_python<Repository>(rsp_const);