From: <pj...@us...> - 2009-05-12 02:22:21
|
Revision: 6343 http://jython.svn.sourceforge.net/jython/?rev=6343&view=rev Author: pjenvey Date: 2009-05-12 01:35:11 +0000 (Tue, 12 May 2009) Log Message: ----------- this metatype check will never happen Modified Paths: -------------- trunk/jython/src/org/python/core/PyType.java Modified: trunk/jython/src/org/python/core/PyType.java =================================================================== --- trunk/jython/src/org/python/core/PyType.java 2009-05-11 21:04:36 UTC (rev 6342) +++ trunk/jython/src/org/python/core/PyType.java 2009-05-12 01:35:11 UTC (rev 6343) @@ -151,7 +151,7 @@ } PyType type; - if (new_.for_type == metatype || metatype == PyType.fromClass(Class.class)) { + if (new_.for_type == metatype) { // XXX: set metatype type = new PyType(); } else { @@ -437,7 +437,7 @@ type_prepended[0] = type; newobj = new_.__get__(null, type).__call__(type_prepended, keywords); } - /* special case type(x) */ + // special case type(x) if (type == TYPE && args.length == 1 && keywords.length == 0) { return newobj; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |