Attachment #93013 for bug #142099






    /* Equivalent to Python's assert statement */
    public static void assert_(PyObject test, PyObject message) {
        if (!test.__nonzero__()) {
            throw new PyException(Py.AssertionError, message);
        }
    }

    public static void assert_(PyObject test) {
        assert_(test, Py.None);
    }

    /* Helpers to implement finally clauses */

Lines 705-711 Link Here

(-)jython-2.1/org/python/core/PyJavaClass.java.orig (-1 / +1 lines)
705	"while", "for", "try", "except", "def", "class", "finally",	705	"while", "for", "try", "except", "def", "class", "finally",
706	"print",	706	"print",
707	"pass", "break", "continue", "return", "import", "from", "del",	707	"pass", "break", "continue", "return", "import", "from", "del",
708	"raise", "global", "exec", "assert"};	708	"raise", "global", "exec", "assert_"};
709	for (int i=0; i<words.length; i++) {	709	for (int i=0; i<words.length; i++) {
710	keywords.put(words[i]+"_", words[i].intern());	710	keywords.put(words[i]+"_", words[i].intern());
711	}	711	}

Lines 197-203 Link Here

(-)jython-2.1/org/python/parser/PythonGrammarConstants.java.orig (-1 / +1 lines)
197	"\"raise\"",	197	"\"raise\"",
198	"\"global\"",	198	"\"global\"",
199	"\"exec\"",	199	"\"exec\"",
200	"\"assert\"",	200	"\"assert_\"",
201	"\"as\"",	201	"\"as\"",
202	"<NAME>",	202	"<NAME>",
203	"<LETTER>",	203	"<LETTER>",

Return to bug 142099

Lines 986-999 Link Here

(-)jython-2.1/org/python/core/Py.java.orig (-3 / +3 lines)
986		986
987		987
988	/* Equivalent to Python's assert statement */	988	/* Equivalent to Python's assert statement */
989	public static void assert(PyObject test, PyObject message) {	989	public static void assert_(PyObject test, PyObject message) {
990	if (!test.__nonzero__()) {	990	if (!test.__nonzero__()) {
991	throw new PyException(Py.AssertionError, message);	991	throw new PyException(Py.AssertionError, message);
992	}	992	}
993	}	993	}
994		994
995	public static void assert(PyObject test) {	995	public static void assert_(PyObject test) {
996	assert(test, Py.None);	996	assert_(test, Py.None);
997	}	997	}
998		998
999	/* Helpers to implement finally clauses */	999	/* Helpers to implement finally clauses */