[Python-checkins] r50564 - in python/branches/bcannon-sandboxing: Include/pyerrors.h Objects/exceptions.c

[brett.cannon]

Author: brett.cannon
Date: Tue Jul 11 03:31:54 2006
New Revision: 50564

Modified:
   python/branches/bcannon-sandboxing/Include/pyerrors.h
   python/branches/bcannon-sandboxing/Objects/exceptions.c
Log:
Add SandboxError exception.


Modified: python/branches/bcannon-sandboxing/Include/pyerrors.h
==============================================================================
--- python/branches/bcannon-sandboxing/Include/pyerrors.h	(original)
+++ python/branches/bcannon-sandboxing/Include/pyerrors.h	Tue Jul 11 03:31:54 2006
@@ -140,6 +140,7 @@
 PyAPI_DATA(PyObject *) PyExc_NameError;
 PyAPI_DATA(PyObject *) PyExc_OverflowError;
 PyAPI_DATA(PyObject *) PyExc_RuntimeError;
+PyAPI_DATA(PyObject *) PyExc_SandboxError;
 PyAPI_DATA(PyObject *) PyExc_NotImplementedError;
 PyAPI_DATA(PyObject *) PyExc_SyntaxError;
 PyAPI_DATA(PyObject *) PyExc_IndentationError;

Modified: python/branches/bcannon-sandboxing/Objects/exceptions.c
==============================================================================
--- python/branches/bcannon-sandboxing/Objects/exceptions.c	(original)
+++ python/branches/bcannon-sandboxing/Objects/exceptions.c	Tue Jul 11 03:31:54 2006
@@ -943,6 +943,11 @@
 SimpleExtendsException(PyExc_StandardError, RuntimeError,
                        "Unspecified run-time error.");
 
+/*
+   SandboxError extends StandardError
+*/
+SimpleExtendsException(PyExc_StandardError, SandboxError,
+			"Attempt to exceed privileges under sandboxing.");
 
 /*
  *    NotImplementedError extends RuntimeError
@@ -2015,6 +2020,7 @@
 #endif
     PRE_INIT(EOFError)
     PRE_INIT(RuntimeError)
+    PRE_INIT(SandboxError)
     PRE_INIT(NotImplementedError)
     PRE_INIT(NameError)
     PRE_INIT(UnboundLocalError)
@@ -2080,6 +2086,7 @@
 #endif
     POST_INIT(EOFError)
     POST_INIT(RuntimeError)
+    POST_INIT(SandboxError)
     POST_INIT(NotImplementedError)
     POST_INIT(NameError)
     POST_INIT(UnboundLocalError)