Merge "Misnamed exception attribute (bug 991936)"

1 files changed, 6 insertions, 6 deletions

diff --git a/keystone/exception.py b/keystone/exception.py
index f1651bf0..84f1e79e 100644
--- a/keystone/exception.py
+++ b/keystone/exception.py
@@ -107,12 +107,6 @@ class Conflict(Error):
     title = 'Conflict'
 
 
-class NotImplemented(Error):
-    """The action you have requested has not been implemented."""
-    code = 501
-    action = 'Not Implemented'
-
-
 class UnexpectedError(Error):
     """An unexpected error prevented the server from fulfilling your request.
 
@@ -121,3 +115,9 @@ class UnexpectedError(Error):
     """
     code = 500
     title = 'Internal Server Error'
+
+
+class NotImplemented(Error):
+    """The action you have requested has not been implemented."""
+    code = 501
+    title = 'Not Implemented'