Fixed autoDetect() for Windows. Should be available in nightly builds starting 9-Nov-2015
authorLou Dasaro <mr_lou_d@netbeans.org>
Sat, 07 Nov 2015 23:25:43 -0600
changeset 18344733f70cbf7d2
parent 18343 0992c33f3ac0
child 18345 b591916abc06
Fixed autoDetect() for Windows. Should be available in nightly builds starting 9-Nov-2015
Task #256368 - Python Platform Autodetect is broken on Windows
python.core/src/org/netbeans/modules/python/api/PythonPlatformManager.java
     1.1 --- a/python.core/src/org/netbeans/modules/python/api/PythonPlatformManager.java	Mon Oct 26 22:29:45 2015 -0400
     1.2 +++ b/python.core/src/org/netbeans/modules/python/api/PythonPlatformManager.java	Sat Nov 07 23:25:43 2015 -0600
     1.3 @@ -31,6 +31,7 @@
     1.4  /**
     1.5   *
     1.6   * @author alley
     1.7 + * @author Lou Dasaro
     1.8   */
     1.9  public class PythonPlatformManager implements Serializable {
    1.10  
    1.11 @@ -452,10 +453,7 @@
    1.12  
    1.13              if (Utilities.isWindows()) {
    1.14                  ad.traverseEnvPaths();
    1.15 -                ad.traverseDirectory(new File("c:/"));
    1.16 -                // ad.searchNestedDirectoies = true; // because traverse turns it off
    1.17 -                // ad.traverse(new File("c:/"), false);
    1.18 -                //}
    1.19 +                ad.traverseDirectory(new File("c:/")); // Python defaults to c:\ on Windows
    1.20              }else{ 
    1.21                  if(Utilities.isMac()){
    1.22                      ad.traverseEnvPaths();
    1.23 @@ -478,6 +476,7 @@
    1.24                          } catch (IOException ioe) {
    1.25                              Exceptions.printStackTrace(ioe);
    1.26                          }
    1.27 +                    }
    1.28                  }
    1.29              }
    1.30  
    1.31 @@ -489,9 +488,9 @@
    1.32                      } catch (IOException ioe) {
    1.33                          Exceptions.printStackTrace(ioe);
    1.34                      }
    1.35 -                    }
    1.36                  }
    1.37              }
    1.38 +            
    1.39          } catch (PythonException py) {
    1.40              Exceptions.printStackTrace(py);
    1.41          } finally {