jython-checkins

[Jython-checkins] SF.net SVN: jython:[5096] branches/asm/src/org/python/modules

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

Revision: 5096
          http://jython.svn.sourceforge.net/jython/?rev=5096&view=rev
Author:   pjenvey
Date:     2008-08-06 18:45:50 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
fix zipimport not handling mismatched APIVersion, and imp.load_module not
handling it either for packages

Modified Paths:
--------------
    branches/asm/src/org/python/modules/imp.java
    branches/asm/src/org/python/modules/zipimport/zipimporter.java

Modified: branches/asm/src/org/python/modules/imp.java
===================================================================
--- branches/asm/src/org/python/modules/imp.java	2008-08-06 18:15:17 UTC (rev 5095)
+++ branches/asm/src/org/python/modules/imp.java	2008-08-06 18:45:50 UTC (rev 5096)
@@ -212,7 +212,7 @@
                     m.__dict__.__setitem__("__path__",
                         new PyList(new PyObject[] { filename }));
                     m.__dict__.__setitem__("__file__", filename);
-                    ModuleInfo mi = findFromSource(name, filename.toString(), true, false);
+                    ModuleInfo mi = findFromSource(name, filename.toString(), true, true);
                     type = mi.type;
                     file = mi.file;
                     filename = new PyString(mi.filename);

Modified: branches/asm/src/org/python/modules/zipimport/zipimporter.java
===================================================================
--- branches/asm/src/org/python/modules/zipimport/zipimporter.java	2008-08-06 18:15:17 UTC (rev 5095)
+++ branches/asm/src/org/python/modules/zipimport/zipimporter.java	2008-08-06 18:45:50 UTC (rev 5096)
@@ -417,11 +417,13 @@
             }
             zipBundle.close();
 
+            if (codeBytes == null) {
+                // bad magic number or non-matching mtime in byte code, try next
+                continue;
+            }
+
             imp.cacheCompiledSource(pathToEntry, null, codeBytes);
             PyCode code = BytecodeLoader.makeCode(fullname + "$py", codeBytes, pathToEntry);
-            if (code == null) {
-                continue;
-            }
             return new ModuleCodeData(code, ispackage, pathToEntry);
         }
         return null;


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

[Jython-checkins] SF.net SVN: jython:[5182] branches/asm/src/org/python/modules

[<le...@us...>]

Revision: 5182
          http://jython.svn.sourceforge.net/jython/?rev=5182&view=rev
Author:   leosoto
Date:     2008-08-15 20:15:50 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
A start for unicodedata. Only implements normalize()

Modified Paths:
--------------
    branches/asm/src/org/python/modules/Setup.java

Added Paths:
-----------
    branches/asm/src/org/python/modules/unicodedata.java

Modified: branches/asm/src/org/python/modules/Setup.java
===================================================================
--- branches/asm/src/org/python/modules/Setup.java	2008-08-15 19:44:57 UTC (rev 5181)
+++ branches/asm/src/org/python/modules/Setup.java	2008-08-15 20:15:50 UTC (rev 5182)
@@ -55,6 +55,7 @@
         "_hashlib",
         "_functools:org.python.modules._functools._functools",
         "_csv:org.python.modules._csv._csv",
-        "_systemrestart"
+        "_systemrestart",
+        "unicodedata"
     };
 }

Added: branches/asm/src/org/python/modules/unicodedata.java
===================================================================
--- branches/asm/src/org/python/modules/unicodedata.java	                        (rev 0)
+++ branches/asm/src/org/python/modules/unicodedata.java	2008-08-15 20:15:50 UTC (rev 5182)
@@ -0,0 +1,25 @@
+package org.python.modules;
+import java.text.Normalizer;
+import java.text.Normalizer.Form;
+
+import org.python.core.Py;
+import org.python.core.PyUnicode;
+
+/**
+ * Incomplete unicodedata module.
+ * 
+ * This should be replaced by a unicodedata module compiled in the same way
+ * as CPython's unicodedata is generated. In the meantime, this implements some
+ * commonly used functions which allows Jython run some popular software (such 
+ * as Django).
+ */
+public class unicodedata {
+
+    /**
+     * Return the normal form 'form' for the Unicode string unistr.  Valid
+     * values for form are 'NFC', 'NFKC', 'NFD', and 'NFKD'. 
+     */
+    public static PyUnicode normalize(String form, String unistr) {
+        return Py.newUnicode(Normalizer.normalize(unistr, Form.valueOf(form)));
+    }
+}


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

[Jython-checkins] SF.net SVN: jython:[5183] branches/asm/src/org/python/modules

[<le...@us...>]

Revision: 5183
          http://jython.svn.sourceforge.net/jython/?rev=5183&view=rev
Author:   leosoto
Date:     2008-08-15 23:03:17 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
Reverted r5182, as the implementation of unicodedata.normalize required Java 1.6. Sorry!

Modified Paths:
--------------
    branches/asm/src/org/python/modules/Setup.java

Removed Paths:
-------------
    branches/asm/src/org/python/modules/unicodedata.java

Modified: branches/asm/src/org/python/modules/Setup.java
===================================================================
--- branches/asm/src/org/python/modules/Setup.java	2008-08-15 20:15:50 UTC (rev 5182)
+++ branches/asm/src/org/python/modules/Setup.java	2008-08-15 23:03:17 UTC (rev 5183)
@@ -55,7 +55,6 @@
         "_hashlib",
         "_functools:org.python.modules._functools._functools",
         "_csv:org.python.modules._csv._csv",
-        "_systemrestart",
-        "unicodedata"
+        "_systemrestart"
     };
 }

Deleted: branches/asm/src/org/python/modules/unicodedata.java
===================================================================
--- branches/asm/src/org/python/modules/unicodedata.java	2008-08-15 20:15:50 UTC (rev 5182)
+++ branches/asm/src/org/python/modules/unicodedata.java	2008-08-15 23:03:17 UTC (rev 5183)
@@ -1,25 +0,0 @@
-package org.python.modules;
-import java.text.Normalizer;
-import java.text.Normalizer.Form;
-
-import org.python.core.Py;
-import org.python.core.PyUnicode;
-
-/**
- * Incomplete unicodedata module.
- * 
- * This should be replaced by a unicodedata module compiled in the same way
- * as CPython's unicodedata is generated. In the meantime, this implements some
- * commonly used functions which allows Jython run some popular software (such 
- * as Django).
- */
-public class unicodedata {
-
-    /**
-     * Return the normal form 'form' for the Unicode string unistr.  Valid
-     * values for form are 'NFC', 'NFKC', 'NFD', and 'NFKD'. 
-     */
-    public static PyUnicode normalize(String form, String unistr) {
-        return Py.newUnicode(Normalizer.normalize(unistr, Form.valueOf(form)));
-    }
-}


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