[Jython-checkins] CVS: jython/org/python/core PySystemState.java,2.33,2.34

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11593

Modified Files:
	PySystemState.java 
Log Message:
initialize(): Move the argument initialization into a method.
With this seemingly unnecessary change, applets can run in netscape 4.05.
I don't know why!!



Index: PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -r2.33 -r2.34
*** PySystemState.java	2000/11/26 16:44:11	2.33
--- PySystemState.java	2000/11/29 19:04:24	2.34
***************
*** 142,146 ****
          initialize();
          modules = new PyStringMap();
!         
          argv = (PyList)defaultArgv.repeat(1);
          path = (PyList)defaultPath.repeat(1);
--- 142,146 ----
          initialize();
          modules = new PyStringMap();
! 
          argv = (PyList)defaultArgv.repeat(1);
          path = (PyList)defaultPath.repeat(1);
***************
*** 309,322 ****
          // Initialize the path (and add system defaults)
          defaultPath = initPath(registry);
  
          // Set up the known Java packages
          initPackages(registry);
- 
-         //System.err.println("ss2");
-         defaultArgv = new PyList();
-         //defaultArgv.append(new PyString(""));
-         for (int i=0; i<argv.length; i++) {
-             defaultArgv.append(new PyString(argv[i]));
-         }
          
          // Finish up standard Python initialization...
--- 309,316 ----
          // Initialize the path (and add system defaults)
          defaultPath = initPath(registry);
+         defaultArgv = initArgv(argv);
  
          // Set up the known Java packages
          initPackages(registry);
          
          // Finish up standard Python initialization...
***************
*** 377,380 ****
--- 371,384 ----
          }
          packageManager = new SysPackageManager(pkgdir, props);
+     }
+ 
+     private static PyList initArgv(String[] args) {
+         PyList argv = new PyList();
+         if (args != null) {
+             for (int i=0; i<args.length; i++) {
+                 argv.append(new PyString(args[i]));
+             }
+         }
+         return argv;
      }