[Jython-checkins] SF.net SVN: jython:[7151] trunk/jython/src/org/python/core/PyModule.java

[<zy...@us...>]

Revision: 7151
          http://jython.svn.sourceforge.net/jython/?rev=7151&view=rev
Author:   zyasoft
Date:     2010-10-16 05:15:00 +0000 (Sat, 16 Oct 2010)

Log Message:
-----------
Re-enable mixing Java and Python code in the same directory without
explicit import via __init__.py. This allows for both import
semantics. Still needs appropriate automated testing.

Fixes #1653. Thanks babelmania for the patch!

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyModule.java

Modified: trunk/jython/src/org/python/core/PyModule.java
===================================================================
--- trunk/jython/src/org/python/core/PyModule.java	2010-10-16 05:12:18 UTC (rev 7150)
+++ trunk/jython/src/org/python/core/PyModule.java	2010-10-16 05:15:00 UTC (rev 7151)
@@ -116,6 +116,14 @@
         return null;
     }
 
+    @Override
+    public PyObject __findattr_ex__(String name) {
+        PyObject attr=super.__findattr_ex__(name);
+        if (attr!=null)
+            return attr;
+        return impAttr(name);
+    }
+
     public void __setattr__(String name, PyObject value) {
         module___setattr__(name, value);
     }


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