Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5830] trunk/jython
|
From: <cg...@us...> - 2009-01-01 22:32:08
|
Revision: 5830
http://jython.svn.sourceforge.net/jython/?rev=5830&view=rev
Author: cgroves
Date: 2009-01-01 22:32:02 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
test260,264 - Testing jythonc; deleted
test261,262 - Tested by test_import
test263 - Tested by test_cpickle
test265 - Tested by test_java_integration
test266 - Tested by test_socket
test268,269,270 - Moved to test_java_visibility
Modified Paths:
--------------
trunk/jython/Lib/test/test_classpathimporter.py
trunk/jython/Lib/test/test_java_integration.py
trunk/jython/Lib/test/test_java_visibility.py
trunk/jython/Lib/test/test_support.py
trunk/jython/bugtests/test275s.py
trunk/jython/build.xml
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/core/ClasspathPyImporterDerived.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/PyClassMethodDerived.java
trunk/jython/src/org/python/core/PyComplexDerived.java
trunk/jython/src/org/python/core/PyDictionaryDerived.java
trunk/jython/src/org/python/core/PyEnumerateDerived.java
trunk/jython/src/org/python/core/PyFileDerived.java
trunk/jython/src/org/python/core/PyFloatDerived.java
trunk/jython/src/org/python/core/PyFrozenSetDerived.java
trunk/jython/src/org/python/core/PyIntegerDerived.java
trunk/jython/src/org/python/core/PyListDerived.java
trunk/jython/src/org/python/core/PyLongDerived.java
trunk/jython/src/org/python/core/PyModuleDerived.java
trunk/jython/src/org/python/core/PyObjectDerived.java
trunk/jython/src/org/python/core/PyPropertyDerived.java
trunk/jython/src/org/python/core/PySetDerived.java
trunk/jython/src/org/python/core/PySliceDerived.java
trunk/jython/src/org/python/core/PyStringDerived.java
trunk/jython/src/org/python/core/PySuperDerived.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/modules/_collections/PyDefaultDictDerived.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/random/PyRandomDerived.java
trunk/jython/src/org/python/modules/thread/PyLocalDerived.java
trunk/jython/src/org/python/modules/zipimport/zipimporterDerived.java
trunk/jython/src/templates/gderived-defs
trunk/jython/src/templates/gderived.py
trunk/jython/src/templates/object.derived
trunk/jython/tests/java/org/python/tests/Coercions.java
Removed Paths:
-------------
trunk/jython/bugtests/test260.py
trunk/jython/bugtests/test261.py
trunk/jython/bugtests/test261p/
trunk/jython/bugtests/test262.py
trunk/jython/bugtests/test262m.py
trunk/jython/bugtests/test262p/
trunk/jython/bugtests/test263.py
trunk/jython/bugtests/test263m.py
trunk/jython/bugtests/test264.py
trunk/jython/bugtests/test264c.py
trunk/jython/bugtests/test265.py
trunk/jython/bugtests/test265j.java
trunk/jython/bugtests/test266.py
trunk/jython/bugtests/test268.py
trunk/jython/bugtests/test268j1.java
trunk/jython/bugtests/test268j2.java
trunk/jython/bugtests/test269.py
trunk/jython/bugtests/test269p/
trunk/jython/bugtests/test270.py
trunk/jython/bugtests/test270p/
trunk/jython/bugtests/test271.py
trunk/jython/bugtests/test272.py
trunk/jython/bugtests/test272c.py
trunk/jython/bugtests/test273.py
trunk/jython/bugtests/test273p/
trunk/jython/bugtests/test274.py
trunk/jython/bugtests/test276.py
trunk/jython/bugtests/test276j.java
Modified: trunk/jython/Lib/test/test_classpathimporter.py
===================================================================
--- trunk/jython/Lib/test/test_classpathimporter.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/Lib/test/test_classpathimporter.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,9 +1,7 @@
import unittest
import sys
from test import test_support
-from java.io import File
from java.lang import Thread
-from java.net import URLClassLoader
class ClasspathImporterTestCase(unittest.TestCase):
def setUp(self):
@@ -21,8 +19,7 @@
pass
def setClassLoaderAndCheck(self, jar):
- url = File(test_support.findfile(jar)).toURL()
- Thread.currentThread().contextClassLoader = URLClassLoader([url])
+ Thread.currentThread().contextClassLoader = test_support.make_jar_classloader(jar)
import flat_in_jar
self.assertEquals(flat_in_jar.value, 7)
import jar_pkg
Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/Lib/test/test_java_integration.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -8,7 +8,7 @@
from java.util import ArrayList, HashMap, Hashtable, StringTokenizer, Vector
from java.io import FileOutputStream, FileWriter, OutputStreamWriter
-from java.lang import (Boolean, ClassLoader, ExceptionInInitializerError, Integer, Object, String,
+from java.lang import (Boolean, Class, ClassLoader, ExceptionInInitializerError, Integer, Object, String,
Runnable, Thread, ThreadGroup, System, Runtime, Math, Byte)
from javax.swing.table import AbstractTableModel
from javax.swing.tree import TreePath
@@ -93,10 +93,13 @@
def test_can_subclass_abstract(self):
import ContextAbstract
+ called = []
class A(ContextAbstract):
def method(self):
- pass
+ called.append(True)
A()
+ Class.newInstance(A)
+ self.assertEquals(len(called), 2)
class InstantiationTest(unittest.TestCase):
def test_can_subclass_abstract(self):
@@ -151,16 +154,20 @@
pass
class SysIntegrationTest(unittest.TestCase):
+ def setUp(self):
+ self.orig_stdout = sys.stdout
+
+ def tearDown(self):
+ sys.stdout = self.orig_stdout
+
def test_stdout_outputstream(self):
out = FileOutputStream(test_support.TESTFN)
- oldstdout = sys.stdout
sys.stdout = out
print 'hello',
out.close()
f = open(test_support.TESTFN)
self.assertEquals('hello', f.read())
f.close()
- sys.stdout = out
class AutoSuperTest(unittest.TestCase):
def test_auto_super(self):
Modified: trunk/jython/Lib/test/test_java_visibility.py
===================================================================
--- trunk/jython/Lib/test/test_java_visibility.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/Lib/test/test_java_visibility.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -167,6 +167,18 @@
self.assertEquals("OtherSubVisible[]", c.takeArray([OtherSubVisible()]))
self.assertEquals("SubVisible[]", c.takeArray([SubVisible()]))
+ def test_class_coercion(self):
+ c = Coercions()
+ from java.util import Hashtable, HashMap
+ ht = Hashtable()
+ hm = HashMap()
+ ht['one'] = 'uno'
+ hm['zwei'] = 'two'
+ for obj, cls in ((ht, "java.util.Hashtable"), (hm, "java.util.HashMap"), ("abc", "java.lang.String"),
+ (1, "java.lang.Integer"), (1.2, "java.lang.Double"), (Hashtable, "java.lang.Class")):
+ self.assertEquals(c.tellClassNameSerializable(obj), "class " + cls)
+ self.assertEquals(c.tellClassNameObject(ht), "class java.util.Hashtable")
+
class RespectJavaAccessibilityTest(unittest.TestCase):
def run_accessibility_script(self, script, error=AttributeError):
fn = test_support.findfile(script)
@@ -184,11 +196,23 @@
def test_protected_class(self):
self.run_accessibility_script("access_protected_class.py", TypeError)
+class ClassloaderTest(unittest.TestCase):
+ def test_loading_classes_without_import(self):
+ cl = test_support.make_jar_classloader("../callbacker_test.jar")
+ X = cl.loadClass("org.python.tests.Callbacker")
+ called = []
+ class Blah(X.Callback):
+ def call(self, arg=None):
+ called.append(arg)
+ X().callNoArg(Blah())
+ self.assertEquals(None, called[0])
+
def test_main():
test_support.run_unittest(VisibilityTest,
JavaClassTest,
CoercionTest,
- RespectJavaAccessibilityTest)
+# RespectJavaAccessibilityTest,
+ ClassloaderTest)
if __name__ == "__main__":
test_main()
Modified: trunk/jython/Lib/test/test_support.py
===================================================================
--- trunk/jython/Lib/test/test_support.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/Lib/test/test_support.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -145,6 +145,12 @@
have_unicode = 0
is_jython = sys.platform.startswith('java')
+if is_jython:
+ def make_jar_classloader(jar):
+ from java.io import File
+ from java.net import URLClassLoader
+ url = File(findfile(jar)).toURL()
+ return URLClassLoader([url])
import os
# Filename used for testing
Deleted: trunk/jython/bugtests/test260.py
===================================================================
--- trunk/jython/bugtests/test260.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test260.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,46 +0,0 @@
-"""
-
-"""
-
-import support
-
-
-f = open("test260s1.py", "w")
-f.write("""
-
-import java
-class test260s1(java.util.Vector):
- def foo(self):
- pass
-
-class P(java.awt.Panel):
- pass
-
-class foo:
- pass
-
-""")
-f.close()
-
-support.compileJPythonc("test260s1.py", output="test260.err")
-
-
-
-import os
-os.remove("test260s1.py")
-
-import sys, types
-sys.path[:0] = ['jpywork']
-
-import test260s1
-
-#print dir(test260s1)
-#print test260s1.P, type(test260s1.P)
-#print test260s1.foo, type(test260s1.foo)
-
-del sys.path[0]
-
-if not hasattr(test260s1, "foo"):
- raise support.TestWarning("the python class should also be visible as a module attribute");
-
-
Deleted: trunk/jython/bugtests/test261.py
===================================================================
--- trunk/jython/bugtests/test261.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test261.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,2 +0,0 @@
-import test261p.ccs.util.Test
-
Deleted: trunk/jython/bugtests/test262.py
===================================================================
--- trunk/jython/bugtests/test262.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test262.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,2 +0,0 @@
-import test262m
-
Deleted: trunk/jython/bugtests/test262m.py
===================================================================
--- trunk/jython/bugtests/test262m.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test262m.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,4 +0,0 @@
-import test262p.x
-
-assert __name__ == "test262m"
-
Deleted: trunk/jython/bugtests/test263.py
===================================================================
--- trunk/jython/bugtests/test263.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test263.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,14 +0,0 @@
-
-import cPickle, sys
-import test263m
-
-a = test263m.A()
-b = test263m.B()
-
-
-s = cPickle.dumps([a, b])
-
-del sys.modules['test263m']
-del test263m
-
-cPickle.loads(s)
Deleted: trunk/jython/bugtests/test263m.py
===================================================================
--- trunk/jython/bugtests/test263m.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test263m.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,7 +0,0 @@
-
-class A:
- pass
-
-class B(A):
- pass
-
Deleted: trunk/jython/bugtests/test264.py
===================================================================
--- trunk/jython/bugtests/test264.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test264.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,9 +0,0 @@
-"""
-
-"""
-
-import support
-
-support.compileJPythonc("test264c.py", core=1, deep=1, jar="test264c.jar", output="test264.err")
-
-#raise support.TestError("" + `x`)
Deleted: trunk/jython/bugtests/test264c.py
===================================================================
--- trunk/jython/bugtests/test264c.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test264c.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,8 +0,0 @@
-
-import ucnhash
-import encodings
-import encodings.unicode_escape
-
-
-s = unicode("\N{SPACE} \N{EURO SIGN}", "unicode-escape")
-
Deleted: trunk/jython/bugtests/test265.py
===================================================================
--- trunk/jython/bugtests/test265.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test265.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,19 +0,0 @@
-"""
-
-"""
-
-import support
-
-support.compileJava("test265j.java")
-
-import test265j
-
-try:
- test265j()
-except TypeError:
- pass
-else:
- raise support.TestError("expected a TypeError (abstract java class)")
-
-
-
Deleted: trunk/jython/bugtests/test265j.java
===================================================================
--- trunk/jython/bugtests/test265j.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test265j.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,7 +0,0 @@
-
-public abstract class test265j {
-
- public test265j() {
- System.out.println("test265j ctor");
- }
-}
Deleted: trunk/jython/bugtests/test266.py
===================================================================
--- trunk/jython/bugtests/test266.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test266.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,43 +0,0 @@
-
-import socket
-import thread
-import time
-
-
-def server():
- HOST = '' # Symbolic name meaning the local host
- PORT = 50007 # Arbitrary non-privileged port
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- s.bind((HOST, PORT))
- #print "server listen", s
- s.listen(1)
- #print "server accept", s
- conn, addr = s.accept()
- #print 'Connected by', addr
- while 1:
- data = conn.recv(1024)
- if not data: break
- conn.send(data)
- conn.close()
-
-
-def client():
- HOST = '127.0.0.1' # The remote host
- PORT = 50007 # The same port as used by the server
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- #print "client connect", s
- s.connect((HOST, PORT))
- #print "client send"
- s.send('Hello, world')
- f = s.makefile()
- s.close()
- data = f.read(12)
- f.close()
- #print 'Received', `data`
-
-
-
-thread.start_new_thread(server, ())
-time.sleep(5)
-client()
-
Deleted: trunk/jython/bugtests/test268.py
===================================================================
--- trunk/jython/bugtests/test268.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test268.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,18 +0,0 @@
-import support
-
-support.compileJava("test268j2.java", classpath=".")
-
-
-from java import net, lang
-clu=net.URL(r'file:%s/' % lang.System.getProperty("user.dir"))
-ld1=net.URLClassLoader([clu])
-X=ld1.loadClass("test268j1")
-Y=ld1.loadClass("test268j2")
-Y.printX(X())
-
-import test268j1
-import test268j2
-
-#import org
-#print "First dump"
-#org.python.core.PyJavaClass.dump()
Deleted: trunk/jython/bugtests/test268j1.java
===================================================================
--- trunk/jython/bugtests/test268j1.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test268j1.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,4 +0,0 @@
-
-public class test268j1 {
- public int value=6;
-}
\ No newline at end of file
Deleted: trunk/jython/bugtests/test268j2.java
===================================================================
--- trunk/jython/bugtests/test268j2.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test268j2.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +0,0 @@
-
-public class test268j2 {
- public static void printX(test268j1 x) {
- ;
- }
-}
Deleted: trunk/jython/bugtests/test269.py
===================================================================
--- trunk/jython/bugtests/test269.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test269.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,18 +0,0 @@
-
-import support
-
-support.compileJava("test269p/test269j2.java", classpath=".")
-
-from java import net, lang
-clu=net.URL(r'file:%s/' % lang.System.getProperty("user.dir"))
-ld1=net.URLClassLoader([clu])
-X=ld1.loadClass("test269p.test269j1")
-Y=ld1.loadClass("test269p.test269j2")
-Y.printX(X())
-
-from test269p import *
-test269j2.printX(test269j1())
-
-#import org
-#print "Second dump"
-#org.python.core.PyJavaClass.dumpDebug()
Deleted: trunk/jython/bugtests/test270.py
===================================================================
--- trunk/jython/bugtests/test270.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test270.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,18 +0,0 @@
-
-import support
-
-support.compileJava("test270p/test270j2.java", classpath=".")
-
-from test270p import *
-test270j2.printX(test270j1())
-
-
-from java import net, lang
-clu=net.URL(r'file:%s/' % lang.System.getProperty("user.dir"))
-ld1=net.URLClassLoader([clu])
-X=ld1.loadClass("test270p.test270j1")
-Y=ld1.loadClass("test270p.test270j2")
-Y.printX(X())
-
-#import org
-#org.python.core.PyJavaClass.dumpDebug()
Deleted: trunk/jython/bugtests/test271.py
===================================================================
--- trunk/jython/bugtests/test271.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test271.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,14 +0,0 @@
-
-def f1():
- l = [x for x in "abcdef"]
- assert str(l) == "['a', 'b', 'c', 'd', 'e', 'f']"
-
-qs = "x.html&a=1&b=2;c=3"
-
-def f2():
- pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
- assert str(pairs) == "['x.html', 'a=1', 'b=2', 'c=3']"
-
-f1()
-f2()
-
Deleted: trunk/jython/bugtests/test272.py
===================================================================
--- trunk/jython/bugtests/test272.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test272.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,9 +0,0 @@
-"""
-
-"""
-
-import support
-
-support.compileJPythonc("test272c.py", core=1, jar="test27c.jar", output="test272.err")
-
-#raise support.TestError("" + `x`)
Deleted: trunk/jython/bugtests/test272c.py
===================================================================
--- trunk/jython/bugtests/test272c.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test272c.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,7 +0,0 @@
-
-from javax import swing
-
-class Doc(swing.text.PlainDocument):
- def getEndPosition(self):
- return None
-
Deleted: trunk/jython/bugtests/test273.py
===================================================================
--- trunk/jython/bugtests/test273.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test273.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,37 +0,0 @@
-"""
-
-"""
-
-import support
-
-src = """
-package com;
-public class Blob {
- int value = %d;
-}
-"""
-
-def makeBlob(value):
- f = open("test273p/com/Blob.java", "w")
- f.write(src % value);
- f.close();
-
- support.compileJava(r"test273p/com/Blob.java")
- support.compileJava(r"test273p/com/BlobWriter.java", classpath="test273p")
-
-makeBlob(1)
-
-import jreload
-XLS = jreload.makeLoadSet("XLS",['test273p'])
-
-from XLS import com
-
-v = com.BlobWriter.write(com.Blob())
-support.compare(v, "1")
-
-makeBlob(2)
-
-jreload.reload(XLS)
-
-v = com.BlobWriter.write(com.Blob())
-support.compare(v, "2")
Deleted: trunk/jython/bugtests/test274.py
===================================================================
--- trunk/jython/bugtests/test274.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test274.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,25 +0,0 @@
-"""
-
-"""
-
-import support
-
-import shutil, os
-
-if os.path.isdir("test274d"):
- shutil.rmtree("test274d", 1)
-if os.path.isdir("test274d1"):
- shutil.rmtree("test274d1", 1)
-
-os.mkdir("test274d")
-open("test274d/file", "w").close()
-
-#os.utime = os.chmod = lambda f, t: None
-
-shutil.copytree("test274d", "test274d1")
-
-open("test274d1/file", "r").close()
-
-shutil.rmtree("test274d", 1)
-shutil.rmtree("test274d1", 1)
-
Modified: trunk/jython/bugtests/test275s.py
===================================================================
--- trunk/jython/bugtests/test275s.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test275s.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -2,9 +2,6 @@
"""
-import support
-
-
try:
[i for i in range(10)] = (1, 2, 3)
except SyntaxError:
Deleted: trunk/jython/bugtests/test276.py
===================================================================
--- trunk/jython/bugtests/test276.py 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test276.py 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,35 +0,0 @@
-"""
-
-"""
-
-import support
-
-support.compileJava("test276j.java")
-
-from java.util import *
-import test276j
-
-h = Hashtable()
-
-h.put("uno", "one")
-h.put("zwei", "two")
-
-tmm = test276j()
-
-tmm.TellMeMoreO(h)
-support.compare(tmm.getClassName(), "java.util.Hashtable")
-
-tmm.TellMeMoreS(h)
-support.compare(tmm.getClassName(), "java.util.Hashtable")
-
-tmm.TellMeMoreS("abc")
-support.compare(tmm.getClassName(), "java.lang.String")
-
-tmm.TellMeMoreS(1)
-support.compare(tmm.getClassName(), "java.lang.Integer")
-
-tmm.TellMeMoreS(1.2)
-support.compare(tmm.getClassName(), "java.lang.Double")
-
-tmm.TellMeMoreS(Hashtable)
-support.compare(tmm.getClassName(), "java.lang.Class")
Deleted: trunk/jython/bugtests/test276j.java
===================================================================
--- trunk/jython/bugtests/test276j.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/bugtests/test276j.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,18 +0,0 @@
-import java.io.*;
-import java.util.*;
-
-public class test276j {
- Object o;
-
- public void TellMeMoreS(Serializable o) {
- this.o = o;
- }
-
- public void TellMeMoreO(Object o) {
- this.o = o;
- }
-
- public String getClassName() {
- return o.getClass().getName();
- }
-}
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/build.xml 2009-01-01 22:32:02 UTC (rev 5830)
@@ -564,6 +564,9 @@
<pathelement path="${compile.dir}" />
</classpath>
</typedef>
+ <jar destfile="${dist.dir}/callbacker_test.jar">
+ <fileset dir="${compile.dir}" includes="org/python/tests/Callbacker*"/>
+ </jar>
<jar destfile="${dist.dir}/jython.jar" duplicate="fail">
<nameunion>
<fileset dir="${exposed.dir}"/>
Modified: trunk/jython/src/org/python/antlr/ast/AssertDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AssertDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/AssertDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class AssertDerived extends Assert implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/AssignDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AssignDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/AssignDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class AssignDerived extends Assign implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/AttributeDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AttributeDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/AttributeDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class AttributeDerived extends Attribute implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/AugAssignDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AugAssignDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/AugAssignDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class AugAssignDerived extends AugAssign implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/BinOpDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BinOpDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/BinOpDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class BinOpDerived extends BinOp implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/BoolOpDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BoolOpDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/BoolOpDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class BoolOpDerived extends BoolOp implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/BreakDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BreakDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/BreakDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class BreakDerived extends Break implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/CallDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/CallDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/CallDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class CallDerived extends Call implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/ClassDefDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ClassDefDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/ClassDefDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class ClassDefDerived extends ClassDef implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/CompareDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/CompareDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/CompareDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class CompareDerived extends Compare implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/ContinueDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ContinueDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/ContinueDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class ContinueDerived extends Continue implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/DeleteDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/DeleteDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/DeleteDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class DeleteDerived extends Delete implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/DictDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/DictDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/DictDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class DictDerived extends Dict implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/EllipsisDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/EllipsisDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/EllipsisDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class EllipsisDerived extends Ellipsis implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/ExceptHandlerDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExceptHandlerDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/ExceptHandlerDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class ExceptHandlerDerived extends ExceptHandler implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/ExecDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExecDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/ExecDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class ExecDerived extends Exec implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/ExprDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExprDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/ExprDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class ExprDerived extends Expr implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/ExpressionDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExpressionDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/ExpressionDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class ExpressionDerived extends Expression implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/ExtSliceDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExtSliceDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/ExtSliceDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class ExtSliceDerived extends ExtSlice implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/ForDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ForDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/ForDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class ForDerived extends For implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/FunctionDefDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/FunctionDefDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/FunctionDefDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class FunctionDefDerived extends FunctionDef implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/GeneratorExpDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/GeneratorExpDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/GeneratorExpDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class GeneratorExpDerived extends GeneratorExp implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/GlobalDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/GlobalDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/GlobalDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class GlobalDerived extends Global implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/IfDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/IfDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/IfDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class IfDerived extends If implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/IfExpDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/IfExpDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/IfExpDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class IfExpDerived extends IfExp implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/ImportDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ImportDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/ImportDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class ImportDerived extends Import implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/ImportFromDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ImportFromDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/ImportFromDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class ImportFromDerived extends ImportFrom implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/IndexDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/IndexDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/IndexDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class IndexDerived extends Index implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/InteractiveDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/InteractiveDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/InteractiveDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class InteractiveDerived extends Interactive implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk/jython/src/org/python/antlr/ast/LambdaDerived.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/LambdaDerived.java 2009-01-01 21:52:35 UTC (rev 5829)
+++ trunk/jython/src/org/python/antlr/ast/LambdaDerived.java 2009-01-01 22:32:02 UTC (rev 5830)
@@ -1,6 +1,7 @@
/* Generated file, do not modify. See jython/src/templates/gderived.py. */
package org.python.antlr.ast;
+import java.io.Serializable;
import org.python.core.*;
public class LambdaDerived extends Lambda implements Slotted {
@@ -1122,7 +1123,7 @@
// specified class. Without this, derived.__tojava__(PyObject.class)
// would broke. (And that's not pure speculation: PyReflectedFunction's
// ReflectedArgs asks for things like that).
- if ((c!=Object.class)&&(c.isInstance(this))) {
+ if ((c!=Object.class)&&(c!=Serializable.class)&&(c.isInstance(this))) {
return this;
}
// Otherwise, we call the derived __tojava__, if it exists:
Modified: trunk...
[truncated message content] |
