jython-checkins

[Samuele P. <ped...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv18820

Modified Files:
	PathPackageManager.java PyJavaPackage.java 
Log Message:
Integrating [ #478763 ] import case sensitivity


Index: PathPackageManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PathPackageManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PathPackageManager.java	2001/10/28 17:13:42	1.5
--- PathPackageManager.java	2001/12/21 00:18:12	1.6
***************
*** 31,35 ****
              if (dir.length() == 0) dir = null;
  
!             if (new File(dir,child).isDirectory()) return true;
          }
          return false;
--- 31,38 ----
              if (dir.length() == 0) dir = null;
  
!             File f = new File(dir,child);
!             if (f.isDirectory() && imp.caseok(f, name, name.length())) {
!                 return true;
!             }
          }
          return false;

Index: PyJavaPackage.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyJavaPackage.java,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -d -r2.16 -r2.17
*** PyJavaPackage.java	2001/10/28 17:13:43	2.16
--- PyJavaPackage.java	2001/12/21 00:18:12	2.17
***************
*** 136,143 ****
          if (ret != null) return ret;
  
!         Class c;
! 
!         c = __mgr__.findClass(__name__,name);
  
          if (c != null) return addClass(name,c);
  
--- 136,145 ----
          if (ret != null) return ret;
  
!         if (__mgr__.packageExists(__name__,name)) {
!             __mgr__.notifyPackageImport(__name__,name);
!             return addPackage(name);
!         }
  
+         Class c = __mgr__.findClass(__name__,name);
          if (c != null) return addClass(name,c);
  
***************
*** 149,157 ****
  
              return Py.None;
-         }
- 
-         if (__mgr__.packageExists(__name__,name)) {
-             __mgr__.notifyPackageImport(__name__,name);
-             return addPackage(name);
          }
  
--- 151,154 ----