[Jython-checkins] SF.net SVN: jython:[6372] trunk/jython

[<pj...@us...>]

Revision: 6372
          http://jython.svn.sourceforge.net/jython/?rev=6372&view=rev
Author:   pjenvey
Date:     2009-05-24 02:53:41 +0000 (Sun, 24 May 2009)

Log Message:
-----------
use $py.class instead of just .class for the imp.PY_COMPILED suffix

Modified Paths:
--------------
    trunk/jython/Lib/test/test_chdir.py
    trunk/jython/src/org/python/modules/imp.java

Modified: trunk/jython/Lib/test/test_chdir.py
===================================================================
--- trunk/jython/Lib/test/test_chdir.py	2009-05-23 20:33:14 UTC (rev 6371)
+++ trunk/jython/Lib/test/test_chdir.py	2009-05-24 02:53:41 UTC (rev 6372)
@@ -14,9 +14,8 @@
 import zipimport
 from test import test_support
 
-COMPILED_SUFFIX = sys.platform.startswith('java') and '$py.class' or \
-    [suffix for suffix, mode, type in imp.get_suffixes()
-     if type == imp.PY_COMPILED][0]
+COMPILED_SUFFIX = [suffix for suffix, mode, type in imp.get_suffixes()
+                   if type == imp.PY_COMPILED][0]
 
 EXECUTABLE = sys.executable or \
     (sys.platform.startswith('java') and 'jython' or None)

Modified: trunk/jython/src/org/python/modules/imp.java
===================================================================
--- trunk/jython/src/org/python/modules/imp.java	2009-05-23 20:33:14 UTC (rev 6371)
+++ trunk/jython/src/org/python/modules/imp.java	2009-05-24 02:53:41 UTC (rev 6372)
@@ -253,7 +253,7 @@
         return new PyList(new PyObject[] {new PyTuple(new PyString(".py"),
                                                       new PyString("r"),
                                                       Py.newInteger(PY_SOURCE)),
-                                          new PyTuple(new PyString(".class"),
+                                          new PyTuple(new PyString("$py.class"),
                                                       new PyString("rb"),
                                                       Py.newInteger(PY_COMPILED)),});
     }


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