old_contents: # vim: tabstop=4 shiftwidth=4 softtabstop=4
  
  # Copyright 2010 United States Government as represented by the
  # Administrator of the National Aeronautics and Space Administration.
  # All Rights Reserved.
  #
  #    Licensed under the Apache License, Version 2.0 (the "License"); you may
  #    not use this file except in compliance with the License. You may obtain
  #    a copy of the License at
  #
  #         http://www.apache.org/licenses/LICENSE-2.0
  #
  #    Unless required by applicable law or agreed to in writing, software
  #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
  """
  Nova base exception handling, including decorator for re-raising
  Nova-type exceptions. SHOULD include dedicated exception logging.
  """
  
  import logging
  import sys
  import traceback
  
  
  class Error(Exception):
      def __init__(self, message=None):
          super(Error, self).__init__(message)
  
  
  class ApiError(Error):
      def __init__(self, message='Unknown', code='Unknown'):
          self.message = message
          self.code = code
          super(ApiError, self).__init__('%s: %s'% (code, message))
  
  
  class NotFound(Error):
      pass
  
  
  class Duplicate(Error):
      pass
  
  
  class NotAuthorized(Error):
      pass
  
  
  class NotEmpty(Error):
      pass
  
  
  class Invalid(Error):
      pass
  
  
  def wrap_exception(f):
      def _wrap(*args, **kw):
          try:
              return f(*args, **kw)
          except Exception, e:
              if not isinstance(e, Error):
                  #exc_type, exc_value, exc_traceback = sys.exc_info()
                  logging.exception('Uncaught exception')
                  #logging.error(traceback.extract_stack(exc_traceback))
                  raise Error(str(e))
              raise
      _wrap.func_name = f.func_name
      return _wrap
  
  
  
new_contents: # vim: tabstop=4 shiftwidth=4 softtabstop=4
  
  # Copyright 2010 United States Government as represented by the
  # Administrator of the National Aeronautics and Space Administration.
  # All Rights Reserved.
  #
  #    Licensed under the Apache License, Version 2.0 (the "License"); you may
  #    not use this file except in compliance with the License. You may obtain
  #    a copy of the License at
  #
  #         http://www.apache.org/licenses/LICENSE-2.0
  #
  #    Unless required by applicable law or agreed to in writing, software
  #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
  """
  Nova base exception handling, including decorator for re-raising
  Nova-type exceptions. SHOULD include dedicated exception logging.
  """
  
  import logging
  import sys
  import traceback
  
  
  class Error(Exception):
      def __init__(self, message=None):
          super(Error, self).__init__(message)
  
  
  class ApiError(Error):
      def __init__(self, message='Unknown', code='Unknown'):
          self.message = message
          self.code = code
          super(ApiError, self).__init__('%s: %s'% (code, message))
  
  
  class NotFound(Error):
      pass
  
  
  class Duplicate(Error):
      pass
  
  
  class NotAuthorized(Error):
      pass
  
  
  class NotEmpty(Error):
      pass
  
  
  class Invalid(Error):
      pass
  
  class InvalidInputException(Error):
      pass
  
  
  def wrap_exception(f):
      def _wrap(*args, **kw):
          try:
              return f(*args, **kw)
          except Exception, e:
              if not isinstance(e, Error):
                  #exc_type, exc_value, exc_traceback = sys.exc_info()
                  logging.exception('Uncaught exception')
                  #logging.error(traceback.extract_stack(exc_traceback))
                  raise Error(str(e))
              raise
      _wrap.func_name = f.func_name
      return _wrap
  
  
  
subject: Address a couple of the TODO's: We now have half-decent input validation for AuthorizeSecurityGroupIngress and RevokeDitto.