[Jython-checkins] SF.net SVN: jython:[5290] trunk/jython/src/org/python/util/jython.java

[<zy...@us...>]

Revision: 5290
          http://jython.svn.sourceforge.net/jython/?rev=5290&view=rev
Author:   zyasoft
Date:     2008-09-05 16:21:55 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
PySystemState.warnoptions was not initialized before adding to it in
the processing of the -W option.

Modified Paths:
--------------
    trunk/jython/src/org/python/util/jython.java

Modified: trunk/jython/src/org/python/util/jython.java
===================================================================
--- trunk/jython/src/org/python/util/jython.java	2008-09-05 03:36:04 UTC (rev 5289)
+++ trunk/jython/src/org/python/util/jython.java	2008-09-05 16:21:55 UTC (rev 5290)
@@ -6,6 +6,8 @@
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -14,6 +16,7 @@
 import org.python.core.PyCode;
 import org.python.core.PyException;
 import org.python.core.PyFile;
+import org.python.core.PyList;
 import org.python.core.PyModule;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
@@ -136,8 +139,8 @@
         // Now create an interpreter
         InteractiveConsole interp = newInterpreter();
 
-        for (int i = 0; i < opts.warnoptions.size(); i++) {
-            String wopt = (String) opts.warnoptions.elementAt(i);
+        PySystemState.warnoptions = new PyList();
+        for (String wopt : opts.warnoptions) {
             PySystemState.warnoptions.append(new PyString(wopt));
         }
 
@@ -333,7 +336,7 @@
     public String[] argv;
     public java.util.Properties properties;
     public String command;
-    public java.util.Vector warnoptions = new java.util.Vector();
+    public List<String> warnoptions = new ArrayList<String>();
     public String encoding;
     public String division;
     public String moduleName;
@@ -403,7 +406,7 @@
                 break;
             }
             else if (arg.equals("-W")) {
-                warnoptions.addElement(args[++index]);
+                warnoptions.add(args[++index]);
             }
             else if (arg.equals("-C")) {
                 encoding = args[++index];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.