Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[6304] trunk/jython
|
From: <pj...@us...> - 2009-05-06 08:20:26
|
Revision: 6304
http://jython.svn.sourceforge.net/jython/?rev=6304&view=rev
Author: pjenvey
Date: 2009-05-06 08:20:08 +0000 (Wed, 06 May 2009)
Log Message:
-----------
Py.matchException -> PyException.match
Oh Py.matchException, how I loathe thee
Modified Paths:
--------------
trunk/jython/Tools/jythonc/SrcGenCompiler.py
trunk/jython/bugtests/classes/test292j.java
trunk/jython/src/org/python/antlr/ast/AssertDerived.java
trunk/jython/src/org/python/antlr/ast/AssignDerived.java
trunk/jython/src/org/python/antlr/ast/AttributeDerived.java
trunk/jython/src/org/python/antlr/ast/AugAssignDerived.java
trunk/jython/src/org/python/antlr/ast/BinOpDerived.java
trunk/jython/src/org/python/antlr/ast/BoolOpDerived.java
trunk/jython/src/org/python/antlr/ast/BreakDerived.java
trunk/jython/src/org/python/antlr/ast/CallDerived.java
trunk/jython/src/org/python/antlr/ast/ClassDefDerived.java
trunk/jython/src/org/python/antlr/ast/CompareDerived.java
trunk/jython/src/org/python/antlr/ast/ContinueDerived.java
trunk/jython/src/org/python/antlr/ast/DeleteDerived.java
trunk/jython/src/org/python/antlr/ast/DictDerived.java
trunk/jython/src/org/python/antlr/ast/EllipsisDerived.java
trunk/jython/src/org/python/antlr/ast/ExceptHandlerDerived.java
trunk/jython/src/org/python/antlr/ast/ExecDerived.java
trunk/jython/src/org/python/antlr/ast/ExprDerived.java
trunk/jython/src/org/python/antlr/ast/ExpressionDerived.java
trunk/jython/src/org/python/antlr/ast/ExtSliceDerived.java
trunk/jython/src/org/python/antlr/ast/ForDerived.java
trunk/jython/src/org/python/antlr/ast/FunctionDefDerived.java
trunk/jython/src/org/python/antlr/ast/GeneratorExpDerived.java
trunk/jython/src/org/python/antlr/ast/GlobalDerived.java
trunk/jython/src/org/python/antlr/ast/IfDerived.java
trunk/jython/src/org/python/antlr/ast/IfExpDerived.java
trunk/jython/src/org/python/antlr/ast/ImportDerived.java
trunk/jython/src/org/python/antlr/ast/ImportFromDerived.java
trunk/jython/src/org/python/antlr/ast/IndexDerived.java
trunk/jython/src/org/python/antlr/ast/InteractiveDerived.java
trunk/jython/src/org/python/antlr/ast/LambdaDerived.java
trunk/jython/src/org/python/antlr/ast/ListCompDerived.java
trunk/jython/src/org/python/antlr/ast/ListDerived.java
trunk/jython/src/org/python/antlr/ast/ModuleDerived.java
trunk/jython/src/org/python/antlr/ast/NameDerived.java
trunk/jython/src/org/python/antlr/ast/NumDerived.java
trunk/jython/src/org/python/antlr/ast/PassDerived.java
trunk/jython/src/org/python/antlr/ast/PrintDerived.java
trunk/jython/src/org/python/antlr/ast/RaiseDerived.java
trunk/jython/src/org/python/antlr/ast/ReprDerived.java
trunk/jython/src/org/python/antlr/ast/ReturnDerived.java
trunk/jython/src/org/python/antlr/ast/SliceDerived.java
trunk/jython/src/org/python/antlr/ast/StrDerived.java
trunk/jython/src/org/python/antlr/ast/SubscriptDerived.java
trunk/jython/src/org/python/antlr/ast/SuiteDerived.java
trunk/jython/src/org/python/antlr/ast/TryExceptDerived.java
trunk/jython/src/org/python/antlr/ast/TryFinallyDerived.java
trunk/jython/src/org/python/antlr/ast/TupleDerived.java
trunk/jython/src/org/python/antlr/ast/UnaryOpDerived.java
trunk/jython/src/org/python/antlr/ast/WhileDerived.java
trunk/jython/src/org/python/antlr/ast/WithDerived.java
trunk/jython/src/org/python/antlr/ast/YieldDerived.java
trunk/jython/src/org/python/antlr/ast/aliasDerived.java
trunk/jython/src/org/python/antlr/ast/argumentsDerived.java
trunk/jython/src/org/python/antlr/ast/comprehensionDerived.java
trunk/jython/src/org/python/antlr/ast/keywordDerived.java
trunk/jython/src/org/python/antlr/op/AddDerived.java
trunk/jython/src/org/python/antlr/op/AndDerived.java
trunk/jython/src/org/python/antlr/op/AugLoadDerived.java
trunk/jython/src/org/python/antlr/op/AugStoreDerived.java
trunk/jython/src/org/python/antlr/op/BitAndDerived.java
trunk/jython/src/org/python/antlr/op/BitOrDerived.java
trunk/jython/src/org/python/antlr/op/BitXorDerived.java
trunk/jython/src/org/python/antlr/op/DelDerived.java
trunk/jython/src/org/python/antlr/op/DivDerived.java
trunk/jython/src/org/python/antlr/op/EqDerived.java
trunk/jython/src/org/python/antlr/op/FloorDivDerived.java
trunk/jython/src/org/python/antlr/op/GtDerived.java
trunk/jython/src/org/python/antlr/op/GtEDerived.java
trunk/jython/src/org/python/antlr/op/InDerived.java
trunk/jython/src/org/python/antlr/op/InvertDerived.java
trunk/jython/src/org/python/antlr/op/IsDerived.java
trunk/jython/src/org/python/antlr/op/IsNotDerived.java
trunk/jython/src/org/python/antlr/op/LShiftDerived.java
trunk/jython/src/org/python/antlr/op/LoadDerived.java
trunk/jython/src/org/python/antlr/op/LtDerived.java
trunk/jython/src/org/python/antlr/op/LtEDerived.java
trunk/jython/src/org/python/antlr/op/ModDerived.java
trunk/jython/src/org/python/antlr/op/MultDerived.java
trunk/jython/src/org/python/antlr/op/NotDerived.java
trunk/jython/src/org/python/antlr/op/NotEqDerived.java
trunk/jython/src/org/python/antlr/op/NotInDerived.java
trunk/jython/src/org/python/antlr/op/OrDerived.java
trunk/jython/src/org/python/antlr/op/ParamDerived.java
trunk/jython/src/org/python/antlr/op/PowDerived.java
trunk/jython/src/org/python/antlr/op/RShiftDerived.java
trunk/jython/src/org/python/antlr/op/StoreDerived.java
trunk/jython/src/org/python/antlr/op/SubDerived.java
trunk/jython/src/org/python/antlr/op/UAddDerived.java
trunk/jython/src/org/python/antlr/op/USubDerived.java
trunk/jython/src/org/python/compiler/CodeCompiler.java
trunk/jython/src/org/python/compiler/Module.java
trunk/jython/src/org/python/compiler/pbc/BytecodeCompiler.java
trunk/jython/src/org/python/core/AstList.java
trunk/jython/src/org/python/core/BaseSet.java
trunk/jython/src/org/python/core/ClasspathPyImporterDerived.java
trunk/jython/src/org/python/core/FunctionThread.java
trunk/jython/src/org/python/core/Py.java
trunk/jython/src/org/python/core/PyArrayDerived.java
trunk/jython/src/org/python/core/PyBaseExceptionDerived.java
trunk/jython/src/org/python/core/PyBooleanDerived.java
trunk/jython/src/org/python/core/PyBytecode.java
trunk/jython/src/org/python/core/PyCallIter.java
trunk/jython/src/org/python/core/PyClassMethodDerived.java
trunk/jython/src/org/python/core/PyComplex.java
trunk/jython/src/org/python/core/PyComplexDerived.java
trunk/jython/src/org/python/core/PyDictionary.java
trunk/jython/src/org/python/core/PyDictionaryDerived.java
trunk/jython/src/org/python/core/PyEnumerateDerived.java
trunk/jython/src/org/python/core/PyException.java
trunk/jython/src/org/python/core/PyFastSequenceIter.java
trunk/jython/src/org/python/core/PyFileDerived.java
trunk/jython/src/org/python/core/PyFloat.java
trunk/jython/src/org/python/core/PyFloatDerived.java
trunk/jython/src/org/python/core/PyFrame.java
trunk/jython/src/org/python/core/PyFrozenSetDerived.java
trunk/jython/src/org/python/core/PyInstance.java
trunk/jython/src/org/python/core/PyInteger.java
trunk/jython/src/org/python/core/PyIntegerDerived.java
trunk/jython/src/org/python/core/PyList.java
trunk/jython/src/org/python/core/PyListDerived.java
trunk/jython/src/org/python/core/PyLong.java
trunk/jython/src/org/python/core/PyLongDerived.java
trunk/jython/src/org/python/core/PyModuleDerived.java
trunk/jython/src/org/python/core/PyObject.java
trunk/jython/src/org/python/core/PyObjectDerived.java
trunk/jython/src/org/python/core/PyPropertyDerived.java
trunk/jython/src/org/python/core/PySequenceIter.java
trunk/jython/src/org/python/core/PySetDerived.java
trunk/jython/src/org/python/core/PySlice.java
trunk/jython/src/org/python/core/PySliceDerived.java
trunk/jython/src/org/python/core/PyString.java
trunk/jython/src/org/python/core/PyStringDerived.java
trunk/jython/src/org/python/core/PyStringMap.java
trunk/jython/src/org/python/core/PySuperDerived.java
trunk/jython/src/org/python/core/PySystemState.java
trunk/jython/src/org/python/core/PyTupleDerived.java
trunk/jython/src/org/python/core/PyTypeDerived.java
trunk/jython/src/org/python/core/PyUnicodeDerived.java
trunk/jython/src/org/python/core/__builtin__.java
trunk/jython/src/org/python/core/imp.java
trunk/jython/src/org/python/core/io/BufferedIOMixin.java
trunk/jython/src/org/python/core/io/IOBase.java
trunk/jython/src/org/python/modules/PyTeeIterator.java
trunk/jython/src/org/python/modules/_collections/PyDefaultDictDerived.java
trunk/jython/src/org/python/modules/_collections/PyDeque.java
trunk/jython/src/org/python/modules/_collections/PyDequeDerived.java
trunk/jython/src/org/python/modules/_csv/PyDialectDerived.java
trunk/jython/src/org/python/modules/_functools/PyPartialDerived.java
trunk/jython/src/org/python/modules/_weakref/ReferenceTypeDerived.java
trunk/jython/src/org/python/modules/binascii.java
trunk/jython/src/org/python/modules/itertools.java
trunk/jython/src/org/python/modules/random/PyRandomDerived.java
trunk/jython/src/org/python/modules/thread/PyLocalDerived.java
trunk/jython/src/org/python/modules/zipimport/zipimporterDerived.java
trunk/jython/src/org/python/util/InteractiveConsole.java
trunk/jython/src/org/python/util/InteractiveInterpreter.java
trunk/jython/src/org/python/util/jython.java
trunk/jython/src/templates/object.derived
trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java
trunk/jython/tests/java/org/python/tests/CustomizableMapHolder.java
Modified: trunk/jython/Tools/jythonc/SrcGenCompiler.py
===================================================================
--- trunk/jython/Tools/jythonc/SrcGenCompiler.py 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/Tools/jythonc/SrcGenCompiler.py 2009-05-06 08:20:08 UTC (rev 6304)
@@ -969,8 +969,7 @@
continue
type = self.visit(exchandler.type)
- t = jast.InvokeStatic("Py", "matchException",
- [exctmp, type.asAny()])
+ t = jast.Invoke(exctmp, "match", [type.asAny()])
newbody = []
if exchandler.name is not None:
Modified: trunk/jython/bugtests/classes/test292j.java
===================================================================
--- trunk/jython/bugtests/classes/test292j.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/bugtests/classes/test292j.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -10,7 +10,7 @@
try {
__builtin__.__import__("test292j1");
} catch (PyException exc) {
- if (!Py.matchException(exc, Py.ImportError))
+ if (!exc.match(Py.ImportError))
throw exc;
}
}
Modified: trunk/jython/src/org/python/antlr/ast/AssertDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AssertDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/AssertDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/AssignDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AssignDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/AssignDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/AttributeDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AttributeDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/AttributeDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/AugAssignDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AugAssignDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/AugAssignDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/BinOpDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BinOpDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/BinOpDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/BoolOpDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BoolOpDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/BoolOpDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/BreakDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BreakDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/BreakDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/CallDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/CallDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/CallDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/ClassDefDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ClassDefDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/ClassDefDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/CompareDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/CompareDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/CompareDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/ContinueDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ContinueDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/ContinueDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/DeleteDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/DeleteDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/DeleteDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/DictDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/DictDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/DictDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/EllipsisDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/EllipsisDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/EllipsisDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/ExceptHandlerDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExceptHandlerDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/ExceptHandlerDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/ExecDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExecDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/ExecDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/ExprDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExprDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/ExprDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/ExpressionDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExpressionDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/ExpressionDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/ExtSliceDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExtSliceDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/ExtSliceDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/ForDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ForDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/ForDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/FunctionDefDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/FunctionDefDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/FunctionDefDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/GeneratorExpDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/GeneratorExpDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/GeneratorExpDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/GlobalDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/GlobalDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/GlobalDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/IfDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/IfDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/IfDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/IfExpDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/IfExpDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/IfExpDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/ImportDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ImportDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/ImportDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/ImportFromDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ImportFromDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/ImportFromDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/IndexDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/IndexDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/IndexDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger(key));
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -1000,7 +1000,7 @@
} // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (!Py.matchException(e,Py.AttributeError)) {
+ if (!e.match(Py.AttributeError)) {
throw e;
} else {
firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
Modified: trunk/jython/src/org/python/antlr/ast/InteractiveDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/InteractiveDerived.java 2009-05-06 05:46:00 UTC (rev 6303)
+++ trunk/jython/src/org/python/antlr/ast/InteractiveDerived.java 2009-05-06 08:20:08 UTC (rev 6304)
@@ -840,7 +840,7 @@
try {
return impl.__get__(this,self_type).__call__();
} catch (PyException exc) {
- if (Py.matchException(exc,Py.StopIteration))
+ if (exc.match(Py.StopIteration))
return null;
throw exc;
}
@@ -855,7 +855,7 @@
try {
return impl.__get__(this,self_type).__call__(key);
} catch (PyException exc) {
- if (Py.matchException(exc,Py.LookupError))
+ if (exc.match(Py.LookupError))
return null;
throw exc;
}
@@ -869,7 +869,7 @@
try {
return impl.__get__(this,self_type).__call__(new PyInteger...
[truncated message content] |
