1.1 --- a/python.editor/src/org/netbeans/modules/python/editor/PythonDeclarationFinder.java	Tue Oct 11 18:29:01 2016 +0200
     1.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/PythonDeclarationFinder.java	Sat Oct 22 00:24:37 2016 -0700
     1.3 @@ -646,7 +646,7 @@
     1.4          // Make sure that the best fit method actually has a corresponding valid source location
     1.5          // and parse tree
     1.6  
     1.7 -        Set<IndexedElement> methods = new HashSet<>(methodSet);
     1.8 +        Set<IndexedElement> methods = new HashSet<IndexedElement>(methodSet);
     1.9  
    1.10          while (!methods.isEmpty()) {
    1.11              IndexedElement method =

     2.1 --- a/python.qshell/src/org/netbeans/modules/python/qshell/TermExecutor.java	Tue Oct 11 18:29:01 2016 +0200
     2.2 +++ b/python.qshell/src/org/netbeans/modules/python/qshell/TermExecutor.java	Sat Oct 22 00:24:37 2016 -0700
     2.3 @@ -113,6 +113,11 @@
     2.4  		public void cwdChanged(String cwd) {
     2.5  			throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     2.6  		}
     2.7 +
     2.8 +		@Override
     2.9 +		public void externalToolCalled(String command) {
    2.10 +			throw new UnsupportedOperationException("Not supported yet.");
    2.11 +		}
    2.12      }
    2.13  
    2.14      private static void error(String fmt, Object...args) {