? compiler/filesystem.attributes
? core/filesystem.attributes
? modules/filesystem.attributes
? parser/filesystem.attributes
Index: compiler/CodeCompiler.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/compiler/CodeCompiler.java,v
retrieving revision 2.15
diff -u -5 -r2.15 CodeCompiler.java
--- compiler/CodeCompiler.java	2001/05/27 18:49:15	2.15
+++ compiler/CodeCompiler.java	2001/07/27 15:50:27
@@ -661,37 +661,37 @@
     public Object Import(SimpleNode node) throws Exception {
         setline(node);
         int n = node.getNumChildren();
         for (int i=0; i<n; i++) {
             SimpleNode cnode = node.getChild(i);
+            SimpleNode asnameNode;
             if (cnode.id == PythonGrammarTreeConstants.JJTDOTTED_AS_NAME) {
                 String name = (String)cnode.getChild(0).visit(this);
-                String asname = (String)cnode.getChild(1).getInfo();
+                asnameNode = cnode.getChild(1);
                 code.ldc(name);
-                code.ldc(asname);
                 loadFrame();
                 if (mrefs.importOneAs == 0) {
                      mrefs.importOneAs = code.pool.Methodref(
                         "org/python/core/imp", "importOneAs",
-                        "(Ljava/lang/String;Ljava/lang/String;Lorg/python/core/PyFrame;)V");
+                        "(Ljava/lang/String;Lorg/python/core/PyFrame;)Lorg/python/core/PyObject;");
                 }
                 code.invokestatic(mrefs.importOneAs);
-                continue;
+            } else {
+                String name = (String)cnode.visit(this);
+                asnameNode = cnode.getChild(0);
+                code.ldc(name);
+                loadFrame();
+                if (mrefs.importOne == 0) {
+                    mrefs.importOne = code.pool.Methodref(
+                        "org/python/core/imp", "importOne",
+                         "(Ljava/lang/String;Lorg/python/core/PyFrame;)Lorg/python/core/PyObject;");
+                }
+                code.invokestatic(mrefs.importOne);
             }
+            
+            set(asnameNode);
 
-            String name = (String)node.getChild(i).visit(this);
-            code.ldc(name);
-            loadFrame();
-            if (mrefs.importOne == 0) {
-                mrefs.importOne = code.pool.Methodref(
-                    "org/python/core/imp", "importOne",
-                    "(Ljava/lang/String;Lorg/python/core/PyFrame;)V");
-            }
-            code.invokestatic(mrefs.importOne);
-            //SimpleNode top = node.getChild(i);
-            //if (top.id != PythonGrammarTreeConstants.JJTNAME) top = top.getChild(0);
-            //set(top);
         }
         return null;
     }
 
 
@@ -703,31 +703,38 @@
         String name = (String)node.getChild(0).visit(this);
         code.ldc(name);
         int n = node.getNumChildren();
         if (n > 1) {
             String[] names = new String[n-1];
-            String[] asnames = new String[n-1];
+            SimpleNode[] asnameNodes = new SimpleNode[n-1];
             for (int i=0; i<n-1; i++) {
                 SimpleNode cnode = node.getChild(i+1);
                 if (cnode.id == PythonGrammarTreeConstants.JJTIMPORT_AS_NAME) {
                     names[i] = (String)cnode.getChild(0).getInfo();
-                    asnames[i] = (String)cnode.getChild(1).getInfo();
+                    asnameNodes[i] = cnode.getChild(1); 
                 } else {
                     names[i] = (String)cnode.getInfo();
-                    asnames[i] = names[i];
+                    asnameNodes[i] = cnode;
                 }
             }
             makeStrings(code, names, names.length);
-            makeStrings(code, asnames, asnames.length);
 
             loadFrame();
             if (mrefs.importFrom == 0) {
                 mrefs.importFrom = code.pool.Methodref(
-                    "org/python/core/imp", "importFromAs",
-                    "(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Lorg/python/core/PyFrame;)V");
+                    "org/python/core/imp", "importFrom",
+                    "(Ljava/lang/String;[Ljava/lang/String;Lorg/python/core/PyFrame;)[Lorg/python/core/PyObject;");
             }
             code.invokestatic(mrefs.importFrom);
+            int tmp = storeTop();
+            for (int i=0; i<n-1; i++) {
+                code.aload(tmp);
+                code.iconst(i);
+                code.aaload();
+                set(asnameNodes[i]);
+            }
+            code.freeLocal(tmp);
         } else {
             loadFrame();
             if (mrefs.importAll == 0) {
                 mrefs.importAll = code.pool.Methodref(
                     "org/python/core/imp", "importAll",
Index: core/imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v
retrieving revision 2.52
diff -u -5 -r2.52 imp.java
--- core/imp.java	2001/07/25 22:01:14	2.52
+++ core/imp.java	2001/07/27 15:50:27
@@ -10,11 +10,11 @@
 /**
  * Utility functions for "import" support.
  */
 public class imp
 {
-    public static final int APIVersion = 8;
+    public static final int APIVersion = 9;
 
     private imp() { ; }
 
     public static PyModule addModule(String name) {
         PyObject modules = Py.getSystemState().modules;
@@ -617,50 +617,51 @@
     
     /**
      * Called from jpython generated code when a statement like "import spam"
      * is executed.
      */
-    public static void importOne(String mod, PyFrame frame) {
+    public static PyObject importOne(String mod, PyFrame frame) {
         //System.out.println("importOne(" + mod + ")");
         PyObject module = __builtin__.__import__(mod,
                                                  frame.f_globals,
-                                                 frame.f_locals,
+                                                 frame.getf_locals(),
                                                  Py.EmptyTuple);
-        int dot = mod.indexOf('.');
+        /*int dot = mod.indexOf('.');
         if (dot != -1) {
             mod = mod.substring(0, dot).intern();
-        }
+        }*/
         //System.err.println("mod: "+mod+", "+dot);
-        frame.setlocal(mod, module);
+        return module;
     }
 
     /**
      * Called from jpython generated code when a statement like
      * "import spam as foo" is executed.
      */
-    public static void importOneAs(String mod, String asname, PyFrame frame) {
+    public static PyObject importOneAs(String mod, PyFrame frame) {
         //System.out.println("importOne(" + mod + ")");
         PyObject module = __builtin__.__import__(mod,
                                                  frame.f_globals,
-                                                 frame.f_locals,
+                                                 frame.getf_locals(),
                                                  getStarArg());
-        frame.setlocal(asname, module);
+        // frame.setlocal(asname, module);
+        return module;
     }
 
     /**
      * Called from jpython generated code when a stamenet like
      * "from spam.eggs import foo, bar" is executed.
      */
-    public static void importFrom(String mod, String[] names, PyFrame frame) {
-        importFromAs(mod, names, names, frame);
+    public static PyObject[] importFrom(String mod, String[] names, PyFrame frame) {
+        return importFromAs(mod, names, null, frame);
     }
 
     /**
      * Called from jpython generated code when a stamenet like
      * "from spam.eggs import foo as spam" is executed.
      */
-    public static void importFromAs(String mod, String[] names,
+    public static PyObject[] importFromAs(String mod, String[] names,
                                     String[] asnames, PyFrame frame)
     {
         //StringBuffer sb = new StringBuffer();
         //for(int i=0; i<names.length; i++)
         //    sb.append(names[i] + " ");
@@ -670,18 +671,20 @@
         for (int i=0; i<names.length; i++)
             pynames[i] = Py.newString(names[i]);
 
         PyObject module = __builtin__.__import__(mod,
                                                  frame.f_globals,
-                                                 frame.f_locals,
+                                                 frame.getf_locals(),
                                                  new PyTuple(pynames));
+        PyObject[] submods = new PyObject[names.length];
         for (int i=0; i<names.length; i++) {
             PyObject submod = module.__findattr__(names[i]);
             if (submod == null)
                 throw Py.ImportError("cannot import name " + names[i]);
-            frame.setlocal(asnames[i], submod);
+            submods[i] = submod;
         }
+        return submods;
     }
 
     private static PyTuple all = null;
 
     private synchronized static PyTuple getStarArg() {
@@ -696,11 +699,11 @@
      */
     public static void importAll(String mod, PyFrame frame) {
         //System.out.println("importAll(" + mod + ")");
         PyObject module = __builtin__.__import__(mod,
                                                  frame.f_globals,
-                                                 frame.f_locals,
+                                                 frame.getf_locals(),
                                                  getStarArg());
         PyObject names;
         boolean filter = true;
         if (module instanceof PyJavaPackage)
             names = ((PyJavaPackage)module).fillDir();