jython-checkins

[Jython-checkins] SF.net SVN: jython:[6522] trunk/jython/src/com/xhaus/modjy/ModjyJServlet. java

[<am...@us...>]

Revision: 6522
          http://jython.svn.sourceforge.net/jython/?rev=6522&view=rev
Author:   amak
Date:     2009-07-07 17:29:56 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Fixing a previously unspotted bug in modjy's handling of imports in .pth files.

Modified Paths:
--------------
    trunk/jython/src/com/xhaus/modjy/ModjyJServlet.java

Modified: trunk/jython/src/com/xhaus/modjy/ModjyJServlet.java
===================================================================
--- trunk/jython/src/com/xhaus/modjy/ModjyJServlet.java	2009-07-07 12:43:53 UTC (rev 6521)
+++ trunk/jython/src/com/xhaus/modjy/ModjyJServlet.java	2009-07-07 17:29:56 UTC (rev 6522)
@@ -189,7 +189,10 @@
                 if (line.startsWith("#"))
                     continue;
                 if (line.startsWith("import"))
+                {
                     interp.exec(line);
+                    continue;
+                }
                 File archiveFile = new File(pythonLibPath, line);
                 String archiveRealpath = archiveFile.getAbsolutePath();
                 systemState.path.append(new PyString(archiveRealpath));


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

[Jython-checkins] SF.net SVN: jython:[7083] trunk/jython/src/com/xhaus/modjy/ModjyJServlet. java

[<am...@us...>]

Revision: 7083
          http://jython.svn.sourceforge.net/jython/?rev=7083&view=rev
Author:   amak
Date:     2010-08-01 12:48:48 +0000 (Sun, 01 Aug 2010)

Log Message:
-----------
Fixing a bug with site-packages processing.
http://bugs.jython.org/issue1629

Modified Paths:
--------------
    trunk/jython/src/com/xhaus/modjy/ModjyJServlet.java

Modified: trunk/jython/src/com/xhaus/modjy/ModjyJServlet.java
===================================================================
--- trunk/jython/src/com/xhaus/modjy/ModjyJServlet.java	2010-07-27 23:44:47 UTC (rev 7082)
+++ trunk/jython/src/com/xhaus/modjy/ModjyJServlet.java	2010-08-01 12:48:48 UTC (rev 7083)
@@ -162,8 +162,8 @@
     protected void setupEnvironment(PythonInterpreter interp,
                                     Properties props,
                                     PySystemState systemState) throws PyException {
+        processPythonLib(interp, systemState);
         checkSitePackages(props);
-        processPythonLib(interp, systemState);
     }
 
     /**


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