From: Liang Chen <cbjchen@cn.ibm.com>
Date: Sun, 18 Aug 2013 12:48:49 +0000 (+0800)
Subject: Remove the rest references to exception.py
X-Git-Tag: 2014.1~132
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1584bc17bb748a8b93f03781e1e210182b2708d3;p=openstack-build%2Fheat-build.git

Remove the rest references to exception.py

Remove the rest references to Oslo exception.py in Heat code base, so that Oslo
maintainer can go ahead and remove the openstack/common/exception.py file.

Change-Id: I19d325e2117f31a887c593e31b61e25729f7a053
---

diff --git a/heat/common/exception.py b/heat/common/exception.py
index 74adf7c5..52972522 100644
--- a/heat/common/exception.py
+++ b/heat/common/exception.py
@@ -21,14 +21,9 @@ import functools
 import urlparse
 import sys
 
-from heat.openstack.common import exception
 from heat.openstack.common import log as logging
 
 
-NotFound = exception.NotFound
-Error = exception.Error
-InvalidContentType = exception.InvalidContentType
-
 _FATAL_EXCEPTION_FORMAT_ERRORS = False
 
 
@@ -342,3 +337,16 @@ class TemplateTooBig(HeatException):
 class EgressRuleNotAllowed(HeatException):
     message = _("Egress rules are only allowed when "
                 "Neutron is used and the 'VpcId' property is set.")
+
+
+class Error(Exception):
+    def __init__(self, message=None):
+        super(Error, self).__init__(message)
+
+
+class NotFound(Error):
+    pass
+
+
+class InvalidContentType(HeatException):
+    message = "Invalid content type %(content_type)s"