Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[6209] trunk/jython
|
From: <pj...@us...> - 2009-04-10 19:21:04
|
Revision: 6209
http://jython.svn.sourceforge.net/jython/?rev=6209&view=rev
Author: pjenvey
Date: 2009-04-10 19:21:01 +0000 (Fri, 10 Apr 2009)
Log Message:
-----------
cleanup class __module__ setup:
o type/ClassType must default a __module__ (instead of Py.makeClass) for when
types are constructed via type(name, bases, dict)
o simplify the compiler's __module__ setup as it should just fail fast
Modified Paths:
--------------
trunk/jython/Lib/test/test_class_jy.py
trunk/jython/src/org/python/compiler/Module.java
trunk/jython/src/org/python/core/Py.java
trunk/jython/src/org/python/core/PyClass.java
trunk/jython/src/org/python/core/PyFrame.java
trunk/jython/src/org/python/core/PyType.java
trunk/jython/src/org/python/core/imp.java
Modified: trunk/jython/Lib/test/test_class_jy.py
===================================================================
--- trunk/jython/Lib/test/test_class_jy.py 2009-04-10 15:36:58 UTC (rev 6208)
+++ trunk/jython/Lib/test/test_class_jy.py 2009-04-10 19:21:01 UTC (rev 6209)
@@ -17,17 +17,24 @@
self.assertEqual(str.__module__, '__builtin__')
class Foo:
pass
- self.assertEqual(Foo.__module__, __name__)
- self.assertEqual(str(Foo), '%s.Foo' % __name__)
- self.assert_(repr(Foo).startswith('<class %s.Foo at' % __name__))
- foo = Foo()
- self.assert_(str(foo).startswith('<%s.Foo instance at' % __name__))
+ Fu = types.ClassType('Fu', (), {})
+ for cls in Foo, Fu:
+ self.assert_('__module__' in cls.__dict__)
+ self.assertEqual(cls.__module__, __name__)
+ self.assertEqual(str(cls), '%s.%s' % (__name__, cls.__name__))
+ self.assert_(repr(cls).startswith('<class %s.%s at' %
+ (__name__, cls.__name__)))
+ obj = cls()
+ self.assert_(str(obj).startswith('<%s.%s instance at' %
+ (__name__, cls.__name__)))
class Bar(object):
pass
class Baz(Object):
pass
- for cls in Bar, Baz:
+ Bang = type('Bang', (), {})
+ for cls in Bar, Baz, Bang:
+ self.assert_('__module__' in cls.__dict__)
self.assertEqual(cls.__module__, __name__)
self.assertEqual(str(cls), "<class '%s.%s'>" % (__name__, cls.__name__))
self.assertEqual(repr(cls), "<class '%s.%s'>" % (__name__, cls.__name__))
Modified: trunk/jython/src/org/python/compiler/Module.java
===================================================================
--- trunk/jython/src/org/python/compiler/Module.java 2009-04-10 15:36:58 UTC (rev 6208)
+++ trunk/jython/src/org/python/compiler/Module.java 2009-04-10 19:21:01 UTC (rev 6209)
@@ -438,25 +438,14 @@
CodeCompiler compiler = new CodeCompiler(this, printResults);
if (classBody) {
- Label label_got_name = new Label();
- int module_tmp = c.getLocal("org/python/core/PyObject");
-
+ // Set the class's __module__ to __name__. fails when there's no __name__
c.aload(1);
c.ldc("__module__");
- c.invokevirtual("org/python/core/PyFrame", "getname_or_null", "(" + $str + ")" + $pyObj);
- c.dup();
- c.ifnonnull(label_got_name);
- c.pop();
c.aload(1);
c.ldc("__name__");
- c.invokevirtual("org/python/core/PyFrame", "getname_or_null", "(" + $str + ")" + $pyObj);
+ c.invokevirtual("org/python/core/PyFrame", "getname", "(" + $str + ")" + $pyObj);
- c.label(label_got_name);
- c.astore(module_tmp);
- c.aload(1);
- c.ldc("__module__");
- c.aload(module_tmp);
c.invokevirtual("org/python/core/PyFrame", "setlocal", "(" + $str + $pyObj + ")V");
}
Modified: trunk/jython/src/org/python/core/Py.java
===================================================================
--- trunk/jython/src/org/python/core/Py.java 2009-04-10 15:36:58 UTC (rev 6208)
+++ trunk/jython/src/org/python/core/Py.java 2009-04-10 19:21:01 UTC (rev 6209)
@@ -1566,14 +1566,6 @@
* @return a new Python Class PyObject
*/
public static PyObject makeClass(String name, PyObject[] bases, PyObject dict) {
- PyFrame frame = getFrame();
- if (dict.__finditem__("__module__") == null) {
- PyObject module = frame.getglobal("__name__");
- if (module != null) {
- dict.__setitem__("__module__", module);
- }
- }
-
PyObject metaclass = dict.__finditem__("__metaclass__");
if (metaclass == null) {
@@ -1584,7 +1576,7 @@
metaclass = base.getType();
}
} else {
- PyObject globals = frame.f_globals;
+ PyObject globals = getFrame().f_globals;
if (globals != null) {
metaclass = globals.__finditem__("__metaclass__");
}
Modified: trunk/jython/src/org/python/core/PyClass.java
===================================================================
--- trunk/jython/src/org/python/core/PyClass.java 2009-04-10 15:36:58 UTC (rev 6208)
+++ trunk/jython/src/org/python/core/PyClass.java 2009-04-10 19:21:01 UTC (rev 6209)
@@ -55,10 +55,8 @@
if (!(dict instanceof PyStringMap || dict instanceof PyDictionary)) {
throw Py.TypeError("PyClass_New: dict must be a dictionary");
}
- if (dict.__finditem__("__doc__") == null) {
- dict.__setitem__("__doc__", Py.None);
- }
- findModule(dict);
+ PyType.ensureDoc(dict);
+ PyType.ensureModule(dict);
if (!(bases instanceof PyTuple)) {
throw Py.TypeError("PyClass_New: bases must be a tuple");
@@ -94,19 +92,6 @@
__contains__ = lookup("__contains__");
}
- private static void findModule(PyObject dict) {
- PyObject module = dict.__finditem__("__module__");
- if (module == null || module == Py.None) {
- PyFrame f = Py.getFrame();
- if (f != null) {
- PyObject nm = f.f_globals.__finditem__("__name__");
- if (nm != null) {
- dict.__setitem__("__module__", nm);
- }
- }
- }
- }
-
PyObject lookup(String name) {
PyObject result = __dict__.__finditem__(name);
if (result == null && __bases__ != null) {
Modified: trunk/jython/src/org/python/core/PyFrame.java
===================================================================
--- trunk/jython/src/org/python/core/PyFrame.java 2009-04-10 15:36:58 UTC (rev 6208)
+++ trunk/jython/src/org/python/core/PyFrame.java 2009-04-10 19:21:01 UTC (rev 6209)
@@ -276,20 +276,6 @@
throw Py.NameError(String.format(NAME_ERROR_MSG, index));
}
- public PyObject getname_or_null(String index) {
- PyObject ret;
- if (f_locals == null || f_locals == f_globals) {
- ret = doGetglobal(index);
- } else {
- ret = f_locals.__finditem__(index);
- if (ret != null) {
- return ret;
- }
- ret = doGetglobal(index);
- }
- return ret;
- }
-
public PyObject getglobal(String index) {
PyObject ret = doGetglobal(index);
if (ret != null) {
Modified: trunk/jython/src/org/python/core/PyType.java
===================================================================
--- trunk/jython/src/org/python/core/PyType.java 2009-04-10 15:36:58 UTC (rev 6208)
+++ trunk/jython/src/org/python/core/PyType.java 2009-04-10 19:21:01 UTC (rev 6209)
@@ -374,10 +374,8 @@
dict.__setitem__("__new__", new PyStaticMethod(new_));
}
- // NOTE: __module__ is already guaranteed by Py.makeClass
- if (dict.__finditem__("__doc__") == null) {
- dict.__setitem__("__doc__", Py.None);
- }
+ ensureDoc(dict);
+ ensureModule(dict);
// Calculate method resolution order
mro_internal();
@@ -396,6 +394,37 @@
}
}
+ /**
+ * Ensure dict contains a __doc__.
+ *
+ * @param dict a PyObject mapping
+ */
+ public static void ensureDoc(PyObject dict) {
+ if (dict.__finditem__("__doc__") == null) {
+ dict.__setitem__("__doc__", Py.None);
+ }
+ }
+
+ /**
+ * Ensure dict contains a __module__, retrieving it from the current frame if it
+ * doesn't exist.
+ *
+ * @param dict a PyObject mapping
+ */
+ public static void ensureModule(PyObject dict) {
+ if (dict.__finditem__("__module__") != null) {
+ return;
+ }
+ PyFrame frame = Py.getFrame();
+ if (frame == null) {
+ return;
+ }
+ PyObject name = frame.f_globals.__finditem__("__name__");
+ if (name != null) {
+ dict.__setitem__("__module__", name);
+ }
+ }
+
private static PyObject invoke_new_(PyObject new_, PyType type, boolean init, PyObject[] args,
String[] keywords) {
PyObject newobj;
Modified: trunk/jython/src/org/python/core/imp.java
===================================================================
--- trunk/jython/src/org/python/core/imp.java 2009-04-10 15:36:58 UTC (rev 6208)
+++ trunk/jython/src/org/python/core/imp.java 2009-04-10 19:21:01 UTC (rev 6209)
@@ -20,7 +20,7 @@
private static final String UNKNOWN_SOURCEFILE = "<unknown>";
- public static final int APIVersion = 19;
+ public static final int APIVersion = 20;
public static final int NO_MTIME = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
