From bccb1f97d2d995b5037c224a5fcf5db08ef84d34 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 Mar 2009 12:47:33 +0100 Subject: [PATCH] do not reimplement built-in exceptions Remove exceptions shadowing built-in ones from molecule.exceptions and update the code to work with this change --- molecule/exception.py | 6 ------ molecule/settings.py | 2 +- molecule/utils.py | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/molecule/exception.py b/molecule/exception.py index 111001f..a086989 100644 --- a/molecule/exception.py +++ b/molecule/exception.py @@ -28,11 +28,5 @@ class MoleculeException(Exception): else: return repr(self.value) -class EnvironmentError(MoleculeException): - """Environment error, self explanatory""" - class SpecFileError(MoleculeException): """Error inside spec file""" - -class NotImplementedError(MoleculeException): - """Error inside spec file""" \ No newline at end of file diff --git a/molecule/settings.py b/molecule/settings.py index 2282c26..5d6b160 100644 --- a/molecule/settings.py +++ b/molecule/settings.py @@ -20,7 +20,7 @@ from __future__ import with_statement import os import threading -from molecule.exception import SpecFileError, EnvironmentError +from molecule.exception import SpecFileError import molecule.utils class Constants(dict): diff --git a/molecule/utils.py b/molecule/utils.py index 4c4c380..4ec7110 100644 --- a/molecule/utils.py +++ b/molecule/utils.py @@ -23,7 +23,6 @@ import sys import time import subprocess import shutil -from molecule.exception import EnvironmentError def get_year(): return time.strftime("%Y")