From: <cg...@us...> - 2009-01-25 12:18:55
|
Revision: 5974 http://jython.svn.sourceforge.net/jython/?rev=5974&view=rev Author: cgroves Date: 2009-01-25 12:15:25 +0000 (Sun, 25 Jan 2009) Log Message: ----------- Bring up to the current state of affairs Modified Paths: -------------- trunk/jython/registry trunk/jython/src/org/python/core/Options.java Modified: trunk/jython/registry =================================================================== --- trunk/jython/registry 2009-01-24 20:17:39 UTC (rev 5973) +++ trunk/jython/registry 2009-01-25 12:15:25 UTC (rev 5974) @@ -17,7 +17,7 @@ python.cachedir = cachedir # Setting this property to true disables the package scan for the cachedir. -# Please be aware that disabling this might break some java import statements +# Please be aware that disabling this will break imporing * from java packages #python.cachedir.skip = false # Properties to check for initializing and updating the package cache @@ -25,10 +25,6 @@ python.packages.paths = java.class.path, sun.boot.class.path python.packages.directories = java.ext.dirs -# To force JIT compilation of Jython code -- should be unnecessary -# Setting this to true will cause jdk1.2rc1 to core dump on Windows -python.options.compileClass = false - # Set verbosity to error, warning, message, comment, or debug # for varying levels of informative messages from Jython. Normally # this option is set from the command line. @@ -45,23 +41,12 @@ # Setting this to a valid codec name will cause the console to use a # different encoding when reading commands from the console. -# The default java encoding is still used when reading python sources -# from the filesystem. #python.console.encoding = cp850 # Setting this to false will allow Jython to provide access to # non-public fields, methods, and constructors of Java objects. python.security.respectJavaAccessibility = true -# List of choices for internal tables impl (PyJavaClasses canonical map etc.), -# these are separated through ':' and tryed from left to right. -# For long running applications under java2, needing classes unloading, -# in order to have jython runtime automatically discarding -# no longer needed info and avoding memory leakage, this can be set -# to weak or soft (=> an impl. using weak-refs or soft-refs will be used). -#python.options.internalTablesImpl = soft -#python.options.internalTablesImpl = weak - # Setting this to true will force Jython will use the first module # found on sys.path where java File.isFile() returns true. # Setting this to true has no effect on unix-type filesystems. @@ -90,15 +75,3 @@ # functionality by having an entry such as os:com.foo.jni.os #python.modules.builtin = whatever -# This specifies the command used by jythonc to compile Java source -# code, along with the complete classpath to use. -# python.jythonc.compiler = /depot/java/plat/bin/jikes -# python.jythonc.classpath = /usr/java1.2/jre/lib/rt.jar:/Jython/dist:. -# python.jythonc.compileropts = +E +D -g - -# python.os determines operating-specific features, similar to and overriding the -# Java property "os.name". -# Some generic values are also supported: 'nt', 'ce' and 'posix'. -# Uncomment the following line for the most generic OS behavior available. -#python.os=None - Modified: trunk/jython/src/org/python/core/Options.java =================================================================== --- trunk/jython/src/org/python/core/Options.java 2009-01-24 20:17:39 UTC (rev 5973) +++ trunk/jython/src/org/python/core/Options.java 2009-01-25 12:15:25 UTC (rev 5974) @@ -54,12 +54,6 @@ public static int verbose = Py.MESSAGE; /** - * Setting this to true will support old 1.0 style keyword+"_" names. This - * isn't needed any more due to improvements in the parser - */ - public static boolean deprecatedKeywordMangling = false; - - /** * A directory where the dynamically generated classes are written. Nothing is * ever read from here, it is only for debugging purposes. */ @@ -131,9 +125,6 @@ "options.showPythonProxyExceptions", Options.showPythonProxyExceptions); - Options.deprecatedKeywordMangling = getBooleanOption( - "deprecated.keywordMangling", Options.deprecatedKeywordMangling); - Options.respectJavaAccessibility = getBooleanOption( "security.respectJavaAccessibility", Options.respectJavaAccessibility); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |