From 2ef747cb778a45ec7eb96f5ba5f725bbf53e970c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Sat, 4 Jun 2011 22:33:16 +0200 Subject: [PATCH] =?UTF-8?q?Cleanup=20in=20packaging:=20don=E2=80=99t=20unn?= =?UTF-8?q?ecessarily=20instantiate=20exceptions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lib/packaging/pypi/dist.py | 2 +- Lib/packaging/pypi/simple.py | 2 +- Lib/packaging/run.py | 2 +- Lib/packaging/tests/test_uninstall.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/packaging/pypi/dist.py b/Lib/packaging/pypi/dist.py index 16510dffd84..db04cdaa706 100644 --- a/Lib/packaging/pypi/dist.py +++ b/Lib/packaging/pypi/dist.py @@ -135,7 +135,7 @@ class ReleaseInfo(IndexReference): not return one existing distribution. """ if len(self.dists) == 0: - raise LookupError() + raise LookupError if dist_type: return self[dist_type] if prefer_source: diff --git a/Lib/packaging/pypi/simple.py b/Lib/packaging/pypi/simple.py index c4921798744..c372c6fe3ef 100644 --- a/Lib/packaging/pypi/simple.py +++ b/Lib/packaging/pypi/simple.py @@ -189,7 +189,7 @@ class Crawler(BaseClient): self._process_index_page(predicate.name) if predicate.name.lower() not in self._projects: - raise ProjectNotFound() + raise ProjectNotFound releases = self._projects.get(predicate.name.lower()) releases.sort_releases(prefer_final=prefer_final) diff --git a/Lib/packaging/run.py b/Lib/packaging/run.py index 1895dde4cc4..7e791a4a3cf 100644 --- a/Lib/packaging/run.py +++ b/Lib/packaging/run.py @@ -383,7 +383,7 @@ def _search(dispatcher, args, **kw): """ #opts = _parse_args(args[1:], '', ['simple', 'xmlrpc']) # 1. what kind of index is requested ? (xmlrpc / simple) - raise NotImplementedError() + raise NotImplementedError actions = [ diff --git a/Lib/packaging/tests/test_uninstall.py b/Lib/packaging/tests/test_uninstall.py index 4b372860592..00e97e4c700 100644 --- a/Lib/packaging/tests/test_uninstall.py +++ b/Lib/packaging/tests/test_uninstall.py @@ -111,7 +111,7 @@ class UninstallTestCase(support.TempdirManager, old = os.rename def _rename(source, target): - raise OSError() + raise OSError os.rename = _rename try: