aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-02-06 14:11:22 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-02-06 14:11:22 +0000
commit05b3a52ec5ab06937bc9038c370db9b347dbe9af (patch)
tree24c2c04de3e6fbf7181859a44f8fb194413aa039 /python
parentbb634210c725c1fa821b61b8f4270f9468099928 (diff)
downloadpaludis-05b3a52ec5ab06937bc9038c370db9b347dbe9af.tar.gz
paludis-05b3a52ec5ab06937bc9038c370db9b347dbe9af.tar.xz
Remove legacy code
Diffstat (limited to 'python')
-rw-r--r--python/Makefile.am4
-rw-r--r--python/dep_list.cc305
-rwxr-xr-xpython/dep_list_TEST.py179
-rwxr-xr-xpython/dep_list_TEST_cleanup.sh8
-rwxr-xr-xpython/dep_list_TEST_setup.sh104
-rw-r--r--python/paludis_python.hh1
-rw-r--r--python/paludis_python_so.cc1
7 files changed, 0 insertions, 602 deletions
diff --git a/python/Makefile.am b/python/Makefile.am
index 00f78f36b..32067bb47 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -29,7 +29,6 @@ IF_PYTHON_TESTS = \
contents_TEST.py \
choices_TEST.py \
dep_label_TEST.py \
- dep_list_TEST.py \
dep_spec_TEST.py \
dep_tag_TEST.py \
environment_TEST.py \
@@ -58,7 +57,6 @@ IF_PYTHON_SOURCES = \
choices.cc \
contents.cc \
dep_label.cc \
- dep_list.cc \
dep_spec.hh dep_spec.cc \
dep_tag.cc \
environment.cc \
@@ -89,7 +87,6 @@ EXTRA_DIST = $(IF_PYTHON_TESTS) $(IF_PYTHON_SOURCES) \
paludis_python_so.cc \
additional_tests_so.cc \
choices_TEST_setup.sh choices_TEST_cleanup.sh \
- dep_list_TEST_setup.sh dep_list_TEST_cleanup.sh \
environment_TEST_setup.sh environment_TEST_cleanup.sh \
mask_TEST_setup.sh mask_TEST_cleanup.sh \
metadata_key_TEST_setup.sh metadata_key_TEST_cleanup.sh \
@@ -134,7 +131,6 @@ libpaludispython_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_PYTHON_SOURCES)
TESTS = $(IF_PYTHON_TESTS)
libpaludispython_@PALUDIS_PC_SLOT@_la_LIBADD = \
- $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
diff --git a/python/dep_list.cc b/python/dep_list.cc
deleted file mode 100644
index 74703e0d8..000000000
--- a/python/dep_list.cc
+++ /dev/null
@@ -1,305 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2007 Piotr Jaroszyński
- *
- * This file is part of the Paludis package manager. Paludis is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include <python/paludis_python.hh>
-#include <python/exception.hh>
-
-#include <paludis/legacy/dep_list.hh>
-#include <paludis/legacy/dep_list_exceptions.hh>
-#include <paludis/util/wrapped_forward_iterator.hh>
-
-
-using namespace paludis;
-using namespace paludis::python;
-namespace bp = boost::python;
-
-struct DepListWrapper
-{
- static void
- add(DepList & self, std::shared_ptr<const SetSpecTree> st,
- std::shared_ptr<const DestinationsSet> & d)
- {
- self.add(*st, d);
- }
-
- static bool
- already_installed(const DepList & self, std::shared_ptr<const DependencySpecTree> st,
- std::shared_ptr<const DestinationsSet> & d)
- {
- return self.already_installed(*st->top(), d);
- }
-};
-
-void expose_dep_list()
-{
- /**
- * Exceptions
- */
- ExceptionRegister::get_instance()->add_exception<DepListError>
- ("DepListError", "BaseException",
- "Thrown if an error occurs whilst building a DepList.");
- ExceptionRegister::get_instance()->add_exception<AllMaskedError>
- ("AllMaskedError", "DepListError",
- "Thrown if all versions of a particular spec are masked.");
- ExceptionRegister::get_instance()->add_exception<AdditionalRequirementsNotMetError>
- ("AdditionalRequirementsNotMetError", "DepListError",
- "Thrown if all versions of a particular spec are masked, "
- "but would not be if additional requirements were not in effect.");
- ExceptionRegister::get_instance()->add_exception<DowngradeNotAllowedError>
- ("DowngradeNotAllowedError", "DepListError",
- "Thrown if a downgrade is forced and we're not allowed to downgrade.");
- ExceptionRegister::get_instance()->add_exception<BlockError>
- ("BlockError", "DepListError",
- "Thrown if a block is encountered.");
- ExceptionRegister::get_instance()->add_exception<CircularDependencyError>
- ("CircularDependencyError", "DepListError",
- "Thrown if a circular dependency is encountered.");
- ExceptionRegister::get_instance()->add_exception<NoDestinationError>
- ("NoDestinationError", "DepListError",
- "Thrown if no destination can be found.");
-
- /**
- * Enums
- */
- enum_auto("DepListTargetType", last_dl_target,
- "Type of target being handled at the top level.");
- enum_auto("DepListReinstallOption", last_dl_reinstall,
- "When we should reinstall.");
- enum_auto("DepListFallBackOption", last_dl_fall_back,
- "When we should fall back to an installed package.");
- enum_auto("DepListReinstallScmOption", last_dl_reinstall_scm,
- "When we should reinstall SCM packages.");
- enum_auto("DepListUpgradeOption", last_dl_upgrade,
- "When we should upgrade.");
- enum_auto("DepListDowngradeOption", last_dl_downgrade,
- "What to do when we downgrade.");
- enum_auto("DepListNewSlotsOption", last_dl_new_slots,
- "When we should pull in a new slot.");
- enum_auto("DepListDepsOption", last_dl_deps,
- "How we should handle a dep class.");
- enum_auto("DepListSuggestedOption", last_dl_suggested,
- "How we should handle suggested deps.");
- enum_auto("DepListCircularOption", last_dl_circular,
- "How we should handle circular deps.");
- enum_auto("DepListBlocksOption", last_dl_blocks,
- "How we handle blocks.");
- enum_auto("DepListUseOption", last_dl_use_deps,
- "How we handle use deps.");
- enum_auto("DepListEntryState", last_dle,
- "State of a DepListEntry.");
- enum_auto("DepListEntryKind", last_dlk,
- "Kind of a DepListEntry.");
-
- /**
- * DepListOptions
- */
- register_shared_ptrs_to_python<DepListOptions>(rsp_non_const);
- bp::class_<DepListOptions, boost::noncopyable>
- (
- "DepListOptions",
- "Parameters for a DepList.",
- bp::init<>("__init__()")
- )
- .add_property("reinstall",
- &named_values_getter<DepListOptions, n::reinstall, DepListReinstallOption, &DepListOptions::reinstall>,
- &named_values_setter<DepListOptions, n::reinstall, DepListReinstallOption, &DepListOptions::reinstall>,
- "[rw] DepListReinstallOption"
- )
-
- .add_property("reinstall_scm",
- &named_values_getter<DepListOptions, n::reinstall_scm, DepListReinstallScmOption, &DepListOptions::reinstall_scm>,
- &named_values_setter<DepListOptions, n::reinstall_scm, DepListReinstallScmOption, &DepListOptions::reinstall_scm>,
- "[rw] DepListReinstallScmOption"
- )
-
- .add_property("target_type",
- &named_values_getter<DepListOptions, n::target_type, DepListTargetType, &DepListOptions::target_type>,
- &named_values_setter<DepListOptions, n::target_type, DepListTargetType, &DepListOptions::target_type>,
- "[rw] DepListTargetType"
- )
-
- .add_property("upgrade",
- &named_values_getter<DepListOptions, n::upgrade, DepListUpgradeOption, &DepListOptions::upgrade>,
- &named_values_setter<DepListOptions, n::upgrade, DepListUpgradeOption, &DepListOptions::upgrade>,
- "[rw] DepListUpgradeOption"
- )
-
- .add_property("downgrade",
- &named_values_getter<DepListOptions, n::downgrade, DepListDowngradeOption, &DepListOptions::downgrade>,
- &named_values_setter<DepListOptions, n::downgrade, DepListDowngradeOption, &DepListOptions::downgrade>,
- "[rw] DepListDowngradeOption"
- )
-
- .add_property("new_slots",
- &named_values_getter<DepListOptions, n::new_slots, DepListNewSlotsOption, &DepListOptions::new_slots>,
- &named_values_setter<DepListOptions, n::new_slots, DepListNewSlotsOption, &DepListOptions::new_slots>,
- "[rw] DepListNewSlotsOption"
- )
-
- .add_property("fall_back",
- &named_values_getter<DepListOptions, n::fall_back, DepListFallBackOption, &DepListOptions::fall_back>,
- &named_values_setter<DepListOptions, n::fall_back, DepListFallBackOption, &DepListOptions::fall_back>,
- "[rw] DepListFallBackOption"
- )
-
- .add_property("installed_deps_pre",
- &named_values_getter<DepListOptions, n::installed_deps_pre, DepListDepsOption, &DepListOptions::installed_deps_pre>,
- &named_values_setter<DepListOptions, n::installed_deps_pre, DepListDepsOption, &DepListOptions::installed_deps_pre>,
- "[rw] DepListDepsOption"
- )
-
- .add_property("installed_deps_runtime",
- &named_values_getter<DepListOptions, n::installed_deps_runtime, DepListDepsOption, &DepListOptions::installed_deps_runtime>,
- &named_values_setter<DepListOptions, n::installed_deps_runtime, DepListDepsOption, &DepListOptions::installed_deps_runtime>,
- "[rw] DepListDepsOption"
- )
-
- .add_property("installed_deps_post",
- &named_values_getter<DepListOptions, n::installed_deps_post, DepListDepsOption, &DepListOptions::installed_deps_post>,
- &named_values_setter<DepListOptions, n::installed_deps_post, DepListDepsOption, &DepListOptions::installed_deps_post>,
- "[rw] DepListDepsOption"
- )
-
- .add_property("uninstalled_deps_pre",
- &named_values_getter<DepListOptions, n::uninstalled_deps_pre, DepListDepsOption, &DepListOptions::uninstalled_deps_pre>,
- &named_values_setter<DepListOptions, n::uninstalled_deps_pre, DepListDepsOption, &DepListOptions::uninstalled_deps_pre>,
- "[rw] DepListDepsOption"
- )
-
- .add_property("uninstalled_deps_runtime",
- &named_values_getter<DepListOptions, n::uninstalled_deps_runtime, DepListDepsOption, &DepListOptions::uninstalled_deps_runtime>,
- &named_values_setter<DepListOptions, n::uninstalled_deps_runtime, DepListDepsOption, &DepListOptions::uninstalled_deps_runtime>,
- "[rw] DepListDepsOption"
- )
-
- .add_property("uninstalled_deps_post",
- &named_values_getter<DepListOptions, n::uninstalled_deps_post, DepListDepsOption, &DepListOptions::uninstalled_deps_post>,
- &named_values_setter<DepListOptions, n::uninstalled_deps_post, DepListDepsOption, &DepListOptions::uninstalled_deps_post>,
- "[rw] DepListDepsOption"
- )
-
- .add_property("uninstalled_deps_suggested",
- &named_values_getter<DepListOptions, n::uninstalled_deps_suggested, DepListDepsOption, &DepListOptions::uninstalled_deps_suggested>,
- &named_values_setter<DepListOptions, n::uninstalled_deps_suggested, DepListDepsOption, &DepListOptions::uninstalled_deps_suggested>,
- "[rw] DepListDepsOption"
- )
-
- .add_property("suggested",
- &named_values_getter<DepListOptions, n::suggested, DepListSuggestedOption, &DepListOptions::suggested>,
- &named_values_setter<DepListOptions, n::suggested, DepListSuggestedOption, &DepListOptions::suggested>,
- "[rw] DepListSuggestedOption"
- )
-
- .add_property("circular",
- &named_values_getter<DepListOptions, n::circular, DepListCircularOption, &DepListOptions::circular>,
- &named_values_setter<DepListOptions, n::circular, DepListCircularOption, &DepListOptions::circular>,
- "[rw] DepListSuggestedOption"
- )
-
- .add_property("use",
- &named_values_getter<DepListOptions, n::use, DepListUseOption, &DepListOptions::use>,
- &named_values_setter<DepListOptions, n::use, DepListUseOption, &DepListOptions::use>,
- "[rw] DepListUseOption"
- )
-
- .add_property("blocks",
- &named_values_getter<DepListOptions, n::blocks, DepListBlocksOption, &DepListOptions::blocks>,
- &named_values_setter<DepListOptions, n::blocks, DepListBlocksOption, &DepListOptions::blocks>,
- "[rw] DepListBlocksOption"
- )
-
- .add_property("dependency_tags",
- &named_values_getter<DepListOptions, n::dependency_tags, bool, &DepListOptions::dependency_tags>,
- &named_values_setter<DepListOptions, n::dependency_tags, bool, &DepListOptions::dependency_tags>,
- "[rw] bool"
- )
- ;
-
- /**
- * DepListEntry
- */
- bp::register_ptr_to_python<DepListEntry *>();
- bp::class_<DepListEntry, boost::noncopyable>
- (
- "DepListEntry",
- "An entry in a DepList.",
- bp::no_init
- )
- .add_property("kind",
- &named_values_getter<DepListEntry, n::kind, DepListEntryKind, &DepListEntry::kind>,
- "[ro] DepListEntryKind"
- )
-
- .add_property("package_id",
- &named_values_getter<DepListEntry, n::package_id, std::shared_ptr<const PackageID>, &DepListEntry::package_id>,
- "[ro] PackageID"
- )
-
- .add_property("tags",
- &named_values_getter<DepListEntry, n::tags, std::shared_ptr<DepListEntryTags>, &DepListEntry::tags>,
- "[ro] DepListEntryTags"
- )
-
- .add_property("destination",
- &named_values_getter<DepListEntry, n::destination, std::shared_ptr<Repository>, &DepListEntry::destination>,
- "[ro] Repository"
- )
-
- .add_property("state",
- &named_values_getter<DepListEntry, n::state, DepListEntryState, &DepListEntry::state>,
- "[ro] DepListEntryState"
- )
- ;
-
- /**
- * DepList
- */
- std::shared_ptr<DepListOptions> (DepList::* options_ptr)() = &DepList::options;
- DepList::Iterator (DepList::*dl_begin_ptr)() = &DepList::begin;
- DepList::Iterator (DepList::*dl_end_ptr)() = &DepList::end;
- bp::class_<DepList, boost::noncopyable>
- (
- "DepList",
- "Holds a list of dependencies in merge order.",
- bp::init<const Environment * const, const DepListOptions &>("__init__(Environment, DepListOptions)")
- )
- .add_property("options", options_ptr,
- "[ro] DepListOptions\n"
- "Our options."
- )
-
- .def("add", &DepListWrapper::add,
- "add(SetSpecTree, DestinationsIterable)\n"
- "Add the packages required to resolve an additional dependency spec."
- )
-
- .def("clear", &DepList::clear,
- "clear()\n"
- "Clear the list."
- )
-
- .def("already_installed", &DepListWrapper::already_installed,
- "already_installed(DepSpec, DestinationsIterable) -> bool\n"
- "Return whether a spec structure is already installed."
- )
-
- .def("__iter__", bp::range<bp::return_internal_reference<> >(dl_begin_ptr, dl_end_ptr))
- ;
-}
-
diff --git a/python/dep_list_TEST.py b/python/dep_list_TEST.py
deleted file mode 100755
index 616bd364f..000000000
--- a/python/dep_list_TEST.py
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 sw=4 sts=4 et :
-
-#
-# Copyright (c) 2007 Piotr Jaroszyński
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-import os
-
-os.environ["PALUDIS_HOME"] = os.path.join(os.getcwd(), "dep_list_TEST_dir/home")
-repo_path = os.path.join(os.getcwd(), "package_id_TEST_dir/testrepo")
-irepo_path = os.path.join(os.getcwd(), "package_id_TEST_dir/installed")
-
-from paludis import *
-import unittest
-
-Log.instance.log_level = LogLevel.WARNING
-
-class TestCase_01_DepListOptions(unittest.TestCase):
- def setUp(self):
- global dlo
- dlo = DepListOptions()
-
- def test_01_create(self):
- pass
-
- def test_02_data_members_types(self):
- self.assert_(isinstance(dlo.reinstall, DepListReinstallOption))
- self.assert_(isinstance(dlo.reinstall_scm, DepListReinstallScmOption))
- self.assert_(isinstance(dlo.target_type, DepListTargetType))
- self.assert_(isinstance(dlo.upgrade, DepListUpgradeOption))
- self.assert_(isinstance(dlo.downgrade, DepListDowngradeOption))
- self.assert_(isinstance(dlo.new_slots, DepListNewSlotsOption))
- self.assert_(isinstance(dlo.fall_back, DepListFallBackOption))
- self.assert_(isinstance(dlo.installed_deps_pre, DepListDepsOption))
- self.assert_(isinstance(dlo.installed_deps_runtime, DepListDepsOption))
- self.assert_(isinstance(dlo.installed_deps_post, DepListDepsOption))
- self.assert_(isinstance(dlo.uninstalled_deps_pre, DepListDepsOption))
- self.assert_(isinstance(dlo.uninstalled_deps_runtime, DepListDepsOption))
- self.assert_(isinstance(dlo.uninstalled_deps_post, DepListDepsOption))
- self.assert_(isinstance(dlo.uninstalled_deps_suggested, DepListDepsOption))
- self.assert_(isinstance(dlo.suggested, DepListSuggestedOption))
- self.assert_(isinstance(dlo.circular, DepListCircularOption))
- self.assert_(isinstance(dlo.use, DepListUseOption))
- self.assert_(isinstance(dlo.blocks, DepListBlocksOption))
- self.assert_(isinstance(dlo.dependency_tags, bool))
-
- def test_03_data_members_set(self):
- dlo.reinstall = DepListReinstallOption.values[0]
- self.assertEquals(dlo.reinstall, DepListReinstallOption.values[0])
-
- dlo.reinstall_scm = DepListReinstallScmOption.values[0]
- self.assertEquals(dlo.reinstall_scm, DepListReinstallScmOption.values[0])
-
- dlo.target_type = DepListTargetType.values[0]
- self.assertEquals(dlo.target_type, DepListTargetType.values[0])
-
- dlo.upgrade = DepListUpgradeOption.values[0]
- self.assertEquals(dlo.upgrade, DepListUpgradeOption.values[0])
-
- dlo.downgrade = DepListDowngradeOption.values[0]
- self.assertEquals(dlo.downgrade, DepListDowngradeOption.values[0])
-
- dlo.new_slots = DepListNewSlotsOption.values[0]
- self.assertEquals(dlo.new_slots, DepListNewSlotsOption.values[0])
-
- dlo.fall_back = DepListFallBackOption.values[0]
- self.assertEquals(dlo.fall_back, DepListFallBackOption.values[0])
-
- dlo.installed_deps_pre = DepListDepsOption.values[0]
- self.assertEquals(dlo.installed_deps_pre, DepListDepsOption.values[0])
-
- dlo.installed_deps_runtime = DepListDepsOption.values[0]
- self.assertEquals(dlo.installed_deps_runtime, DepListDepsOption.values[0])
-
- dlo.installed_deps_post = DepListDepsOption.values[0]
- self.assertEquals(dlo.installed_deps_post, DepListDepsOption.values[0])
-
- dlo.uninstalled_deps_pre = DepListDepsOption.values[0]
- self.assertEquals(dlo.uninstalled_deps_pre, DepListDepsOption.values[0])
-
- dlo.uninstalled_deps_runtime = DepListDepsOption.values[0]
- self.assertEquals(dlo.uninstalled_deps_runtime, DepListDepsOption.values[0])
-
- dlo.uninstalled_deps_post = DepListDepsOption.values[0]
- self.assertEquals(dlo.uninstalled_deps_post, DepListDepsOption.values[0])
-
- dlo.uninstalled_deps_suggested = DepListDepsOption.values[0]
- self.assertEquals(dlo.uninstalled_deps_suggested, DepListDepsOption.values[0])
-
- dlo.suggested = DepListSuggestedOption.values[0]
- self.assertEquals(dlo.suggested, DepListSuggestedOption.values[0])
-
- dlo.circular = DepListCircularOption.values[0]
- self.assertEquals(dlo.circular, DepListCircularOption.values[0])
-
- dlo.use = DepListUseOption.values[0]
- self.assertEquals(dlo.use, DepListUseOption.values[0])
-
- dlo.blocks = DepListBlocksOption.values[0]
- self.assertEquals(dlo.blocks, DepListBlocksOption.values[0])
-
- dlo.dependency_tags = False
- self.assertEquals(dlo.dependency_tags, False)
-
-class TestCase_02_DepList(unittest.TestCase):
- def setUp(self):
- global env, dl, dd, pds, cds
- env = EnvironmentFactory.instance.create("")
- dl = DepList(env, DepListOptions())
- dd = env.default_destinations
- pds = parse_user_package_dep_spec("foo/bar", env, [])
- cds = env.set("bar")
-
- def test_01_create(self):
- pass
-
- def test_02_options(self):
- self.assert_(isinstance(dl.options, DepListOptions))
-
- def test_04_clear(self):
- dl.add(pds, dd)
- dl.clear()
-
- def test_05_add(self):
- dl.add(pds, dd)
- dl.clear()
- dl.add(cds, dd)
-
- def test_06_already_installed(self):
- self.assert_(not dl.already_installed(pds, dd))
- dl.add(cds, dd)
- self.assert_(dl.already_installed(pds, dd))
-
- def test_07_entries(self):
- dl.add(pds, dd)
-
- entries = list(dl)
- self.assert_(isinstance(entries[0], DepListEntry))
-
-
-class TestCase_03_DepListEntry(unittest.TestCase):
- def setUp(self):
- global env, dl, dd, pds, cds
- env = EnvironmentFactory.instance.create("")
- dl = DepList(env, DepListOptions())
- dd = env.default_destinations
-
- def test_01_no_create(self):
- self.assertRaises(Exception, DepListEntry)
-
- def test_02_data_members(self):
- dl.add(pds, dd)
-
- dle = list(dl)[0]
-
- self.assertEquals(dle.kind, DepListEntryKind.PACKAGE)
- self.assertEquals(dle.package_id.name, "foo/bar")
- self.assertEquals(list(dle.tags), [])
- self.assertEquals(str(dle.destination.name), "installed")
- self.assertEquals(dle.state, DepListEntryState.HAS_ALL_DEPS)
-
-
-if __name__ == "__main__":
- unittest.main()
-
diff --git a/python/dep_list_TEST_cleanup.sh b/python/dep_list_TEST_cleanup.sh
deleted file mode 100755
index 781c82102..000000000
--- a/python/dep_list_TEST_cleanup.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-if [ -d dep_list_TEST_dir ] ; then
- rm -fr dep_list_TEST_dir
-else
- true
-fi
diff --git a/python/dep_list_TEST_setup.sh b/python/dep_list_TEST_setup.sh
deleted file mode 100755
index 89231b30c..000000000
--- a/python/dep_list_TEST_setup.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-mkdir dep_list_TEST_dir || exit 1
-cd dep_list_TEST_dir || exit 1
-
-mkdir -p home/.paludis/repositories
-
-cat <<END > home/.paludis/repositories/testrepo.conf
-location = `pwd`/testrepo
-format = e
-names_cache = /var/empty
-cache = /var/empty
-profiles = \${location}/profiles/testprofile
-builddir = `pwd`
-END
-
-cat <<END > home/.paludis/repositories/installed.conf
-location = `pwd`/installed
-format = vdb
-names_cache = /var/empty
-provides_cache = /var/empty
-builddir = `pwd`
-END
-
-cat <<END > home/.paludis/keywords.conf
-*/* test
-~foo/bar-1.0 ~test
-END
-
-cat <<END > home/.paludis/use.conf
-*/* enabled
-~foo/bar-1.0 sometimes_enabled
-END
-
-cat <<END > home/.paludis/package_mask.conf
-=foo/bar-3*
-END
-
-cat <<END > home/.paludis/licenses.conf
-*/* *
-END
-
-cat <<END > home/.paludis/general.conf
-world = /dev/null
-END
-
-mkdir -p testrepo/{eclass,sets,distfiles,profiles/testprofile,foo/bar/files} || exit 1
-cd testrepo || exit 1
-echo "testrepo" > profiles/repo_name || exit 1
-cat <<END > profiles/categories || exit 1
-foo
-END
-cat <<END > profiles/testprofile/make.defaults
-ARCH=test
-USERLAND=test
-KERNEL=test
-END
-cat <<END > profiles/profiles.desc
-test testprofile stable
-END
-cat <<END > sets/bar.conf
-* foo/bar
-END
-
-cat <<"END" > foo/bar/bar-1.0.ebuild || exit 1
-DESCRIPTION="Test package"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI=""
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="test"
-END
-
-cat <<"END" > foo/bar/bar-2.0.ebuild || exit 1
-DESCRIPTION="Test package"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI=""
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="~test"
-END
-cd ..
-
-mkdir -p installed/cat-one/pkg-one-1 || exit 1
-
-for i in SLOT EAPI; do
- echo "0" >installed/cat-one/pkg-one-1/${i}
-done
-
-for i in DEPEND RDEPEND LICENSE INHERITED IUSE PDEPEND PROVIDE; do
- touch installed/cat-one/pkg-one-1/${i}
-done
-
-echo "flag1 flag2" >>installed/cat-one/pkg-one-1/USE
-
-cat <<END >installed/cat-one/pkg-one-1/CONTENTS
-dir //test
-obj /test/test_file de54c26b0678df67aca147575523b3c2 1165250496
-sym /test/test_link -> /test/test_file 1165250496
-END
-
diff --git a/python/paludis_python.hh b/python/paludis_python.hh
index 0f467c021..2dc5fb38d 100644
--- a/python/paludis_python.hh
+++ b/python/paludis_python.hh
@@ -176,7 +176,6 @@ void expose_action() PALUDIS_VISIBLE;
void expose_choices() PALUDIS_VISIBLE;
void expose_contents() PALUDIS_VISIBLE;
void expose_dep_label() PALUDIS_VISIBLE;
-void expose_dep_list() PALUDIS_VISIBLE;
void expose_dep_spec() PALUDIS_VISIBLE;
void expose_dep_tag() PALUDIS_VISIBLE;
void expose_environment() PALUDIS_VISIBLE;
diff --git a/python/paludis_python_so.cc b/python/paludis_python_so.cc
index 61ac66301..9517ead30 100644
--- a/python/paludis_python_so.cc
+++ b/python/paludis_python_so.cc
@@ -40,7 +40,6 @@ BOOST_PYTHON_MODULE(paludis)
expose_dep_spec();
expose_dep_tag();
expose_dep_label();
- expose_dep_list();
expose_name();
expose_log();
expose_environment();