[Jython-checkins] SF.net SVN: jython:[5625] branches/newstyle-java-types/src/org/python/core/ PyType.java

[<cg...@us...>]

Revision: 5625
          http://jython.svn.sourceforge.net/jython/?rev=5625&view=rev
Author:   cgroves
Date:     2008-11-24 01:57:05 +0000 (Mon, 24 Nov 2008)

Log Message:
-----------
Don't strip the package out of wrapped Java types

Modified Paths:
--------------
    branches/newstyle-java-types/src/org/python/core/PyType.java

Modified: branches/newstyle-java-types/src/org/python/core/PyType.java
===================================================================
--- branches/newstyle-java-types/src/org/python/core/PyType.java	2008-11-24 00:00:42 UTC (rev 5624)
+++ branches/newstyle-java-types/src/org/python/core/PyType.java	2008-11-24 01:57:05 UTC (rev 5625)
@@ -962,13 +962,14 @@
         if (base == null) {
             base = c.getSuperclass();
         }
+        newtype.underlying_class = c;
         if (name == null) {
             name = c.getName();
             // Strip the java fully qualified class name (specifically remove org.python.core.Py or
             // fallback to stripping to the last dot)
             if (name.startsWith("org.python.core.Py")) {
                 name = name.substring("org.python.core.Py".length()).toLowerCase();
-            } else {
+            } else if(newtype.getProxyType() == null) {
                 int lastDot = name.lastIndexOf('.');
                 if (lastDot != -1) {
                     name = name.substring(lastDot + 1);
@@ -976,7 +977,6 @@
             }
         }
         newtype.name = name;
-        newtype.underlying_class = c;
         newtype.builtin = true;
         fillInMRO(newtype, base); // basic mro, base, bases
         newtype.fillDict();


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