Index: com/ziclix/python/sql/FilterDataHandler.java =================================================================== RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/FilterDataHandler.java,v retrieving revision 1.4 diff -u -r1.4 FilterDataHandler.java --- com/ziclix/python/sql/FilterDataHandler.java 3 Jul 2003 20:06:47 -0000 1.4 +++ com/ziclix/python/sql/FilterDataHandler.java 28 Jun 2004 18:27:52 -0000 @@ -11,7 +11,6 @@ import org.python.core.PyObject; import org.python.core.PyList; -import org.python.core.PyString; import org.python.core.Py; import java.sql.PreparedStatement; Index: com/ziclix/python/sql/Procedure.java =================================================================== RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/Procedure.java,v retrieving revision 1.9 diff -u -r1.9 Procedure.java --- com/ziclix/python/sql/Procedure.java 9 Apr 2003 13:49:13 -0000 1.9 +++ com/ziclix/python/sql/Procedure.java 28 Jun 2004 18:27:52 -0000 @@ -91,7 +91,7 @@ this.procedureCatalog = getDefault(); this.procedureSchema = getDefault(); this.procedureName = name; - } else if (this.cursor.isSeq(name)) { + } else if (PyCursor.isSeq(name)) { if (name.__len__() == 3) { this.procedureCatalog = name.__getitem__(0); this.procedureSchema = name.__getitem__(1); Index: com/ziclix/python/sql/connect/Connectx.java =================================================================== RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/connect/Connectx.java,v retrieving revision 1.3 diff -u -r1.3 Connectx.java --- com/ziclix/python/sql/connect/Connectx.java 26 Mar 2002 02:47:01 -0000 1.3 +++ com/ziclix/python/sql/connect/Connectx.java 28 Jun 2004 18:27:52 -0000 @@ -10,7 +10,6 @@ package com.ziclix.python.sql.connect; import java.sql.*; -import java.util.*; import javax.sql.*; import java.lang.reflect.*; import org.python.core.*; Index: com/ziclix/python/sql/pipe/db/BaseDB.java =================================================================== RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/pipe/db/BaseDB.java,v retrieving revision 1.2 diff -u -r1.2 BaseDB.java --- com/ziclix/python/sql/pipe/db/BaseDB.java 11 Jan 2002 21:46:01 -0000 1.2 +++ com/ziclix/python/sql/pipe/db/BaseDB.java 28 Jun 2004 18:27:52 -0000 @@ -9,11 +9,9 @@ */ package com.ziclix.python.sql.pipe.db; -import java.util.*; import java.lang.reflect.*; import org.python.core.*; import com.ziclix.python.sql.*; -import com.ziclix.python.sql.handler.*; /** * Abstract class to assist in generating cursors. Index: com/ziclix/python/sql/pipe/db/DBSink.java =================================================================== RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/pipe/db/DBSink.java,v retrieving revision 1.3 diff -u -r1.3 DBSink.java --- com/ziclix/python/sql/pipe/db/DBSink.java 29 Mar 2002 04:01:03 -0000 1.3 +++ com/ziclix/python/sql/pipe/db/DBSink.java 28 Jun 2004 18:27:52 -0000 @@ -13,7 +13,6 @@ import org.python.core.*; import com.ziclix.python.sql.*; import com.ziclix.python.sql.pipe.*; -import com.ziclix.python.sql.handler.*; /** * A database consumer. All data transferred will be inserted into the appropriate table. Index: com/ziclix/python/sql/pipe/db/DBSource.java =================================================================== RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/pipe/db/DBSource.java,v retrieving revision 1.2 diff -u -r1.2 DBSource.java --- com/ziclix/python/sql/pipe/db/DBSource.java 29 Mar 2002 04:01:03 -0000 1.2 +++ com/ziclix/python/sql/pipe/db/DBSource.java 28 Jun 2004 18:27:52 -0000 @@ -12,7 +12,6 @@ import org.python.core.*; import com.ziclix.python.sql.*; import com.ziclix.python.sql.pipe.*; -import com.ziclix.python.sql.handler.*; /** * A database source. Given a PyConnection and information about the query, produce the data. Index: com/ziclix/python/sql/util/BCP.java =================================================================== RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/util/BCP.java,v retrieving revision 1.1 diff -u -r1.1 BCP.java --- com/ziclix/python/sql/util/BCP.java 20 Nov 2001 04:55:18 -0000 1.1 +++ com/ziclix/python/sql/util/BCP.java 28 Jun 2004 18:27:52 -0000 @@ -9,13 +9,10 @@ */ package com.ziclix.python.sql.util; -import java.util.*; -import java.lang.reflect.*; import org.python.core.*; import com.ziclix.python.sql.*; import com.ziclix.python.sql.pipe.*; import com.ziclix.python.sql.pipe.db.*; -import com.ziclix.python.sql.handler.*; /** * A class to perform efficient Bulk CoPy of database tables. Index: com/ziclix/python/sql/util/PyArgParser.java =================================================================== RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/util/PyArgParser.java,v retrieving revision 1.1 diff -u -r1.1 PyArgParser.java --- com/ziclix/python/sql/util/PyArgParser.java 20 Nov 2001 04:55:18 -0000 1.1 +++ com/ziclix/python/sql/util/PyArgParser.java 28 Jun 2004 18:27:52 -0000 @@ -9,9 +9,6 @@ */ package com.ziclix.python.sql.util; -import java.io.*; -import java.sql.*; -import java.math.*; import java.util.*; import org.python.core.*; Index: org/apache/oro/text/regex/MalformedPatternException.java =================================================================== RCS file: /cvsroot/jython/jython/org/apache/oro/text/regex/MalformedPatternException.java,v retrieving revision 2.1 diff -u -r2.1 MalformedPatternException.java --- org/apache/oro/text/regex/MalformedPatternException.java 13 Oct 2000 19:53:10 -0000 2.1 +++ org/apache/oro/text/regex/MalformedPatternException.java 28 Jun 2004 18:27:52 -0000 @@ -57,7 +57,6 @@ * by Daniel F. Savarese. We appreciate his contributions. */ -import java.lang.*; /** * A class used to signify the occurrence of a syntax error in a Index: org/apache/oro/text/regex/Perl5Matcher.java =================================================================== RCS file: /cvsroot/jython/jython/org/apache/oro/text/regex/Perl5Matcher.java,v retrieving revision 2.1 diff -u -r2.1 Perl5Matcher.java --- org/apache/oro/text/regex/Perl5Matcher.java 13 Oct 2000 19:53:11 -0000 2.1 +++ org/apache/oro/text/regex/Perl5Matcher.java 28 Jun 2004 18:27:53 -0000 @@ -57,7 +57,6 @@ * by Daniel F. Savarese. We appreciate his contributions. */ -import java.io.IOException; import java.util.*; /** Index: org/python/compiler/ArgListCompiler.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/ArgListCompiler.java,v retrieving revision 2.9 diff -u -r2.9 ArgListCompiler.java --- org/python/compiler/ArgListCompiler.java 30 May 2002 16:13:28 -0000 2.9 +++ org/python/compiler/ArgListCompiler.java 28 Jun 2004 18:27:53 -0000 @@ -4,9 +4,7 @@ import org.python.parser.*; import org.python.parser.ast.*; -import java.io.IOException; import java.util.Vector; -import java.util.Enumeration; public class ArgListCompiler extends Visitor implements PythonGrammarTreeConstants Index: org/python/compiler/CodeCompiler.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/CodeCompiler.java,v retrieving revision 2.32 diff -u -r2.32 CodeCompiler.java --- org/python/compiler/CodeCompiler.java 25 Aug 2003 12:24:14 -0000 2.32 +++ org/python/compiler/CodeCompiler.java 28 Jun 2004 18:27:53 -0000 @@ -5,13 +5,11 @@ import org.python.parser.*; import org.python.parser.ast.*; import org.python.parser.ast.Attribute; -import org.python.core.Py; import org.python.core.PyObject; import org.python.core.PyInteger; import org.python.core.PyFloat; import org.python.core.PyLong; import org.python.core.PyComplex; -import org.python.core.PyException; import org.python.core.CompilerFlags; import java.io.IOException; import java.util.Stack; @@ -1671,9 +1669,10 @@ public int getslice, setslice, delslice; public Object Slice(Subscript node, Slice slice) throws Exception { int ctx = node.ctx; - if (ctx == node.AugStore && augmode == node.Store) { + if (ctx == expr_contextType.AugStore + && augmode == expr_contextType.Store) { restoreAugTmps(node, 4); - ctx = node.Store; + ctx = expr_contextType.Store; } else { visit(node.value); if (slice.lower != null) @@ -1689,9 +1688,10 @@ else code.aconst_null(); - if (node.ctx == node.AugStore && augmode == node.Load) { + if (node.ctx == expr_contextType.AugStore + && augmode == expr_contextType.Load) { saveAugTmps(node, 4); - ctx = node.Load; + ctx = expr_contextType.Load; } } @@ -1733,16 +1733,18 @@ } int ctx = node.ctx; - if (node.ctx == node.AugStore && augmode == node.Store) { + if (node.ctx == expr_contextType.AugStore + && augmode == expr_contextType.Store) { restoreAugTmps(node, 2); - ctx = node.Store; + ctx = expr_contextType.Store; } else { visit(node.value); visit(node.slice); - if (node.ctx == node.AugStore && augmode == node.Load) { + if (node.ctx == expr_contextType.AugStore + && augmode == expr_contextType.Load) { saveAugTmps(node, 2); - ctx = node.Load; + ctx = expr_contextType.Load; } } @@ -1798,16 +1800,18 @@ public Object visitAttribute(Attribute node) throws Exception { int ctx = node.ctx; - if (node.ctx == node.AugStore && augmode == node.Store) { + if (node.ctx == expr_contextType.AugStore + && augmode == expr_contextType.Store) { restoreAugTmps(node, 2); - ctx = node.Store; + ctx = expr_contextType.Store; } else { visit(node.value); code.ldc(getName(node.attr)); - if (node.ctx == node.AugStore && augmode == node.Load) { + if (node.ctx == expr_contextType.AugStore + && augmode == expr_contextType.Load) { saveAugTmps(node, 2); - ctx = node.Load; + ctx = expr_contextType.Load; } } @@ -1880,8 +1884,10 @@ /* if (mode ==AUGSET) throw new ParseException( "augmented assign to tuple not possible", node); */ - if (node.ctx == node.Store) return seqSet(node.elts); - if (node.ctx == node.Del) return seqDel(node.elts); + if (node.ctx == expr_contextType.Store) + return seqSet(node.elts); + if (node.ctx == expr_contextType.Del) + return seqDel(node.elts); code.new_(code.pool.Class("org/python/core/PyTuple")); code.dup(); @@ -1907,8 +1913,8 @@ throw new ParseException( "augmented assign to list not possible", node); */ - if (node.ctx == node.Store) return seqSet(node.elts); - if (node.ctx == node.Del) return seqDel(node.elts); + if (node.ctx == expr_contextType.Store) return seqSet(node.elts); + if (node.ctx == expr_contextType.Del) return seqDel(node.elts); code.new_(code.pool.Class("org/python/core/PyList")); code.dup(); @@ -2165,7 +2171,7 @@ SymInfo syminf = (SymInfo)tbl.get(name); int ctx = node.ctx; - if (ctx == node.AugStore) { + if (ctx == expr_contextType.AugStore) { ctx = augmode; } Index: org/python/compiler/JavaMaker.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/JavaMaker.java,v retrieving revision 2.16 diff -u -r2.16 JavaMaker.java --- org/python/compiler/JavaMaker.java 15 Oct 2002 14:32:28 -0000 2.16 +++ org/python/compiler/JavaMaker.java 28 Jun 2004 18:27:53 -0000 @@ -3,10 +3,7 @@ package org.python.compiler; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.Hashtable; import org.python.core.PyObject; -import org.python.core.PyProxy; -import org.python.core.Py; public class JavaMaker extends ProxyMaker implements ClassConstants { Index: org/python/compiler/Label.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/Label.java,v retrieving revision 2.4 diff -u -r2.4 Label.java --- org/python/compiler/Label.java 27 Nov 2001 19:07:21 -0000 2.4 +++ org/python/compiler/Label.java 28 Jun 2004 18:27:53 -0000 @@ -3,7 +3,6 @@ package org.python.compiler; import java.io.*; -import java.util.Vector; class Label { int position; Index: org/python/core/BytecodeLoader.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/BytecodeLoader.java,v retrieving revision 2.15 diff -u -r2.15 BytecodeLoader.java --- org/python/core/BytecodeLoader.java 28 Oct 2001 17:13:42 -0000 2.15 +++ org/python/core/BytecodeLoader.java 28 Jun 2004 18:27:53 -0000 @@ -1,9 +1,6 @@ // Copyright (c) Corporation for National Research Initiatives package org.python.core; -import java.io.*; -import java.util.StringTokenizer; -import java.util.Hashtable; import java.util.Vector; /** Index: org/python/core/BytecodeLoader1.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/BytecodeLoader1.java,v retrieving revision 2.4 diff -u -r2.4 BytecodeLoader1.java --- org/python/core/BytecodeLoader1.java 28 Oct 2001 17:13:42 -0000 2.4 +++ org/python/core/BytecodeLoader1.java 28 Jun 2004 18:27:53 -0000 @@ -1,7 +1,6 @@ // Copyright (c) Corporation for National Research Initiatives package org.python.core; -import java.io.*; import java.util.*; /** Index: org/python/core/BytecodeLoader2.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/BytecodeLoader2.java,v retrieving revision 2.4 diff -u -r2.4 BytecodeLoader2.java --- org/python/core/BytecodeLoader2.java 28 Oct 2001 17:13:42 -0000 2.4 +++ org/python/core/BytecodeLoader2.java 28 Jun 2004 18:27:53 -0000 @@ -1,7 +1,6 @@ // Copyright (c) Corporation for National Research Initiatives package org.python.core; -import java.io.*; import java.util.*; import java.security.*; Index: org/python/core/MakeProxies.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/MakeProxies.java,v retrieving revision 2.18 diff -u -r2.18 MakeProxies.java --- org/python/core/MakeProxies.java 28 Oct 2001 17:13:42 -0000 2.18 +++ org/python/core/MakeProxies.java 28 Jun 2004 18:27:53 -0000 @@ -2,13 +2,10 @@ package org.python.core; -import java.lang.reflect.*; import java.util.Vector; -import java.util.Hashtable; import java.io.*; import org.python.compiler.JavaMaker; import org.python.compiler.AdapterMaker; -import org.python.compiler.ProxyMaker; class MakeProxies Index: org/python/core/PathPackageManager.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PathPackageManager.java,v retrieving revision 1.6 diff -u -r1.6 PathPackageManager.java --- org/python/core/PathPackageManager.java 21 Dec 2001 00:18:12 -0000 1.6 +++ org/python/core/PathPackageManager.java 28 Jun 2004 18:27:53 -0000 @@ -4,7 +4,6 @@ package org.python.core; import java.io.*; -import java.lang.reflect.Modifier; /** Path package manager. Gathering classes info dynamically * from a set of directories in path {@link #searchPath}, and Index: org/python/core/PyJavaClass.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyJavaClass.java,v retrieving revision 2.42 diff -u -r2.42 PyJavaClass.java --- org/python/core/PyJavaClass.java 6 Aug 2003 11:46:26 -0000 2.42 +++ org/python/core/PyJavaClass.java 28 Jun 2004 18:27:53 -0000 @@ -2,7 +2,6 @@ package org.python.core; import java.lang.reflect.*; -import java.beans.*; /** * A wrapper around a java class. Index: org/python/core/PyJavaPackage.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyJavaPackage.java,v retrieving revision 2.18 diff -u -r2.18 PyJavaPackage.java --- org/python/core/PyJavaPackage.java 6 Aug 2003 11:46:26 -0000 2.18 +++ org/python/core/PyJavaPackage.java 28 Jun 2004 18:27:53 -0000 @@ -4,7 +4,6 @@ package org.python.core; import java.util.*; -import java.io.File; /** * A representation of java package. Index: org/python/core/PySystemState.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v retrieving revision 2.80 diff -u -r2.80 PySystemState.java --- org/python/core/PySystemState.java 18 Apr 2003 11:05:06 -0000 2.80 +++ org/python/core/PySystemState.java 28 Jun 2004 18:27:53 -0000 @@ -704,7 +704,7 @@ try { while(available()==0) { //System.err.println("waiting..."); - Thread.currentThread().sleep(100); + Thread.sleep(100); } } catch (InterruptedException e) { throw new PyException(Py.KeyboardInterrupt, @@ -731,20 +731,18 @@ } public PyObject __call__(PyObject arg) { - PySystemState sys = Py.getThreadState().systemState; switch (index) { case 10: - sys.displayhook(arg); + PySystemState.displayhook(arg); return Py.None; default: throw argCountError(1); } } public PyObject __call__(PyObject arg1, PyObject arg2, PyObject arg3) { - PySystemState sys = Py.getThreadState().systemState; switch (index) { case 30: - sys.excepthook(arg1, arg2, arg3); + PySystemState.excepthook(arg1, arg2, arg3); return Py.None; default: throw argCountError(3); Index: org/python/core/SoftIInternalTables.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/SoftIInternalTables.java,v retrieving revision 2.4 diff -u -r2.4 SoftIInternalTables.java --- org/python/core/SoftIInternalTables.java 1 Feb 2001 16:41:11 -0000 2.4 +++ org/python/core/SoftIInternalTables.java 28 Jun 2004 18:27:53 -0000 @@ -3,7 +3,6 @@ package org.python.core; import java.lang.ref.*; -import java.util.*; public class SoftIInternalTables extends AutoInternalTables { Index: org/python/core/SyspathJavaLoader.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/SyspathJavaLoader.java,v retrieving revision 2.6 diff -u -r2.6 SyspathJavaLoader.java --- org/python/core/SyspathJavaLoader.java 3 Jan 2003 00:49:34 -0000 2.6 +++ org/python/core/SyspathJavaLoader.java 28 Jun 2004 18:27:53 -0000 @@ -4,7 +4,6 @@ package org.python.core; import java.io.*; import java.util.StringTokenizer; -import java.util.Hashtable; import java.util.zip.*; public class SyspathJavaLoader extends ClassLoader Index: org/python/core/WeakInternalTables.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/WeakInternalTables.java,v retrieving revision 2.5 diff -u -r2.5 WeakInternalTables.java --- org/python/core/WeakInternalTables.java 1 Feb 2001 16:41:11 -0000 2.5 +++ org/python/core/WeakInternalTables.java 28 Jun 2004 18:27:54 -0000 @@ -3,7 +3,6 @@ package org.python.core; import java.lang.ref.*; -import java.util.*; public class WeakInternalTables extends AutoInternalTables { Index: org/python/core/__builtin__.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v retrieving revision 2.57 diff -u -r2.57 __builtin__.java --- org/python/core/__builtin__.java 6 Aug 2003 11:46:26 -0000 2.57 +++ org/python/core/__builtin__.java 28 Jun 2004 18:27:54 -0000 @@ -1,7 +1,6 @@ // Copyright (c) Corporation for National Research Initiatives package org.python.core; -import org.python.parser.SimpleNode; import java.util.Hashtable; import java.math.BigInteger; Index: org/python/core/exceptions.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/exceptions.java,v retrieving revision 1.12 diff -u -r1.12 exceptions.java --- org/python/core/exceptions.java 6 Jan 2002 21:19:13 -0000 1.12 +++ org/python/core/exceptions.java 28 Jun 2004 18:27:54 -0000 @@ -2,8 +2,6 @@ package org.python.core; -import java.lang.reflect.*; - /** * The builtin exceptions module. The entire module should be imported * from python. None of the methods defined here should be called Index: org/python/core/imp.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v retrieving revision 2.64 diff -u -r2.64 imp.java --- org/python/core/imp.java 3 Jan 2003 00:49:34 -0000 2.64 +++ org/python/core/imp.java 28 Jun 2004 18:27:54 -0000 @@ -1,10 +1,7 @@ // Copyright (c) Corporation for National Research Initiatives package org.python.core; -import java.lang.reflect.*; import java.io.*; -import java.util.Hashtable; -import java.util.Properties; import java.util.zip.*; /** Index: org/python/modules/SHA1.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/modules/SHA1.java,v retrieving revision 2.5 diff -u -r2.5 SHA1.java --- org/python/modules/SHA1.java 6 Aug 2003 11:46:26 -0000 2.5 +++ org/python/modules/SHA1.java 28 Jun 2004 18:27:54 -0000 @@ -43,7 +43,6 @@ package org.python.modules; -import java.util.*; import org.python.core.*; /** Index: org/python/modules/_codecs.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/modules/_codecs.java,v retrieving revision 2.9 diff -u -r2.9 _codecs.java --- org/python/modules/_codecs.java 5 Aug 2001 13:42:28 -0000 2.9 +++ org/python/modules/_codecs.java 28 Jun 2004 18:27:54 -0000 @@ -9,7 +9,6 @@ package org.python.modules; import org.python.core.*; -import org.python.core.imp; public class _codecs { Index: org/python/modules/_sre.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/modules/_sre.java,v retrieving revision 1.7 diff -u -r1.7 _sre.java --- org/python/modules/_sre.java 6 Jan 2002 15:53:24 -0000 1.7 +++ org/python/modules/_sre.java 28 Jun 2004 18:27:56 -0000 @@ -15,7 +15,6 @@ package org.python.modules; -import java.util.*; import org.python.core.*; import org.python.modules.sre.*; Index: org/python/modules/binascii.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/modules/binascii.java,v retrieving revision 2.7 diff -u -r2.7 binascii.java --- org/python/modules/binascii.java 28 Oct 2001 17:13:44 -0000 2.7 +++ org/python/modules/binascii.java 28 Jun 2004 18:27:56 -0000 @@ -9,8 +9,6 @@ package org.python.modules; -import java.util.*; - import org.python.core.*; /** Index: org/python/modules/cStringIO.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/modules/cStringIO.java,v retrieving revision 1.14 diff -u -r1.14 cStringIO.java --- org/python/modules/cStringIO.java 11 Mar 2002 12:35:02 -0000 1.14 +++ org/python/modules/cStringIO.java 28 Jun 2004 18:27:56 -0000 @@ -8,9 +8,6 @@ package org.python.modules; -import java.io.*; -import java.util.*; - import org.python.core.*; /** Index: org/python/modules/os.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/modules/os.java,v retrieving revision 2.7 diff -u -r2.7 os.java --- org/python/modules/os.java 28 Oct 2001 17:13:44 -0000 2.7 +++ org/python/modules/os.java 28 Jun 2004 18:27:56 -0000 @@ -22,7 +22,7 @@ dict.__setitem__(name, module.__getattr__(sname)); } - String prefix = Py.getSystemState().prefix; + String prefix = PySystemState.prefix; if (prefix != null) { String libdir = prefix + "/Lib/javaos.py"; dict.__setitem__("__file__", new PyString(libdir)); Index: org/python/modules/struct.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/modules/struct.java,v retrieving revision 2.7 diff -u -r2.7 struct.java --- org/python/modules/struct.java 29 Oct 2002 10:54:37 -0000 2.7 +++ org/python/modules/struct.java 28 Jun 2004 18:27:56 -0000 @@ -8,7 +8,6 @@ package org.python.modules; -import java.io.*; import org.python.core.*; /** Index: org/python/modules/time.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v retrieving revision 2.20 diff -u -r2.20 time.java --- org/python/modules/time.java 27 Nov 2001 19:07:22 -0000 2.20 +++ org/python/modules/time.java 28 Jun 2004 18:27:56 -0000 @@ -23,7 +23,6 @@ import org.python.core.*; import java.text.DateFormatSymbols; -import java.text.DateFormat; import java.lang.reflect.*; import java.util.*; @@ -487,10 +486,10 @@ // week 0 if (cal == null) cal = _tupletocal(tup); - cal.setFirstDayOfWeek(cal.SUNDAY); + cal.setFirstDayOfWeek(Calendar.SUNDAY); cal.setMinimalDaysInFirstWeek(7); - j = cal.get(cal.WEEK_OF_YEAR); - if (cal.get(cal.MONTH) == cal.JANUARY && j >= 52) + j = cal.get(Calendar.WEEK_OF_YEAR); + if (cal.get(Calendar.MONTH) == Calendar.JANUARY && j >= 52) j = 0; s = s + _twodigit(j); break; @@ -506,11 +505,11 @@ // week 0 if (cal == null) cal = _tupletocal(tup); - cal.setFirstDayOfWeek(cal.MONDAY); + cal.setFirstDayOfWeek(Calendar.MONDAY); cal.setMinimalDaysInFirstWeek(7); - j = cal.get(cal.WEEK_OF_YEAR); + j = cal.get(Calendar.WEEK_OF_YEAR); - if (cal.get(cal.MONTH) == cal.JANUARY && j >= 52) + if (cal.get(Calendar.MONTH) == Calendar.JANUARY && j >= 52) j = 0; s = s + _twodigit(j); break; Index: org/python/modules/sre/SRE_STATE.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/modules/sre/SRE_STATE.java,v retrieving revision 1.10 diff -u -r1.10 SRE_STATE.java --- org/python/modules/sre/SRE_STATE.java 31 May 2002 10:37:43 -0000 1.10 +++ org/python/modules/sre/SRE_STATE.java 28 Jun 2004 18:27:56 -0000 @@ -17,8 +17,6 @@ package org.python.modules.sre; -import java.util.*; - public class SRE_STATE { /* illegal opcode */ public static final int SRE_ERROR_ILLEGAL = -1; Index: org/python/parser/PythonGrammarTokenManager.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTokenManager.java,v retrieving revision 2.20 diff -u -r2.20 PythonGrammarTokenManager.java --- org/python/parser/PythonGrammarTokenManager.java 25 Aug 2003 12:24:14 -0000 2.20 +++ org/python/parser/PythonGrammarTokenManager.java 28 Jun 2004 18:27:56 -0000 @@ -1,6 +1,5 @@ /* Generated By:JJTree&JavaCC: Do not edit this line. PythonGrammarTokenManager.java */ package org.python.parser; -import org.python.parser.ast.modType; public class PythonGrammarTokenManager implements PythonGrammarConstants { Index: org/python/rmi/UnicastRemoteObject.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/rmi/UnicastRemoteObject.java,v retrieving revision 2.3 diff -u -r2.3 UnicastRemoteObject.java --- org/python/rmi/UnicastRemoteObject.java 28 Oct 2001 17:13:44 -0000 2.3 +++ org/python/rmi/UnicastRemoteObject.java 28 Jun 2004 18:27:56 -0000 @@ -5,7 +5,7 @@ public class UnicastRemoteObject extends java.rmi.server.RemoteServer { Remote remote; - public UnicastRemoteObject() throws RemoteException { + public UnicastRemoteObject(Remote remote) throws RemoteException { this.remote = remote; java.rmi.server.UnicastRemoteObject.exportObject(remote); }