[Jython-checkins] SF.net SVN: jython:[5043] branches/asm

[<nr...@us...>]

Revision: 5043
          http://jython.svn.sourceforge.net/jython/?rev=5043&view=rev
Author:   nriley
Date:     2008-08-01 20:22:22 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
Replace python.prepath with python.path.

Modified Paths:
--------------
    branches/asm/NEWS
    branches/asm/src/org/python/core/PySystemState.java

Modified: branches/asm/NEWS
===================================================================
--- branches/asm/NEWS	2008-08-01 20:07:47 UTC (rev 5042)
+++ branches/asm/NEWS	2008-08-01 20:22:22 UTC (rev 5043)
@@ -2,6 +2,7 @@
 
 Jython 2.5
   Incompatible Changes
+    - The python.prepath property has been removed; use python.path instead.
     - To implement the Java Map interface, PyDictionary.values now returns a
     Collection instead of a PyList
     - The -E codec command line option (use a different codec when reading from

Modified: branches/asm/src/org/python/core/PySystemState.java
===================================================================
--- branches/asm/src/org/python/core/PySystemState.java	2008-08-01 20:07:47 UTC (rev 5042)
+++ branches/asm/src/org/python/core/PySystemState.java	2008-08-01 20:22:22 UTC (rev 5043)
@@ -703,12 +703,11 @@
 
     private static PyList initPath(Properties props, boolean standalone, String jarFileName) {
         PyList path = new PyList();
-        addPaths(path, props.getProperty("python.prepath", ""));
+        addPaths(path, props.getProperty("python.path", ""));
         if (prefix != null) {
             String libpath = new File(prefix, "Lib").toString();
             path.append(new PyString(libpath));
         }
-        addPaths(path, props.getProperty("python.path", ""));
         if (standalone) {
             // standalone jython: add the /Lib directory inside JYTHON_JAR to the path
             addPaths(path, jarFileName + "/Lib");


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