[[nbpython-commits]] [hg] main/contrib: Improve computation of Python module names to...

  • From: Tor Norbye < >
  • To:
  • Subject: [[nbpython-commits]] [hg] main/contrib: Improve computation of Python module names to...
  • Date: Thu, 21 Oct 2010 08:34:30 -0700

changeset 42bd596bd69d in main/contrib
details: http://hg.netbeans.org/main/contrib?cmd=changeset;node=42bd596bd69d
description:
        Improve computation of Python module names to discover that a source 
root should be part of the module name. Update the python index schema 
version to force recomputations (and update preindexed data.)

diffstat:

 python.editor/external/binaries-list                                         
          |   2 +-
 python.editor/src/org/netbeans/modules/python/editor/PythonIndexer.java      
          |   2 +-
 python.editor/src/org/netbeans/modules/python/editor/PythonUtils.java        
          |  16 +
 
python.editor/test/unit/data/testfiles/ConfigParser.py.testClasses.completion 
         |  10 +-
 
python.editor/test/unit/data/testfiles/ConfigParser.py.testImports1.completion
         |   9 +-
 
python.editor/test/unit/data/testfiles/compl.py.testObjMethodCompletion1.completion
    |   7 +-
 
python.editor/test/unit/data/testfiles/compl2.py.testObjMethodCompletion5.completion
   |  84 ++++++++++
 
python.editor/test/unit/data/testfiles/compl2.py.testObjMethodConstructors2.completion
 |   8 +
 
python.editor/test/unit/data/testfiles/compl2.py.testObjMethodConstructors3.completion
 |   3 +
 python.editor/test/unit/data/testfiles/datetime.py.testLocals2.completion    
          |  10 +-
 python.editor/test/unit/data/testfiles/empty.py.testKeywords.completion      
          |   5 +-
 python.editor/test/unit/data/testfiles/imports3.py.testImports3.completion   
          |   9 +-
 python.editor/test/unit/data/testfiles/imports4.py.testImports4.completion   
          |   9 +-
 python.editor/test/unit/data/testfiles/imports6.py.testImports6.completion   
          |   9 +-
 
python.editor/test/unit/data/testfiles/occurrences2.py.testLocals4.completion 
         |   7 +-
 
python.editor/test/unit/data/testfiles/occurrences2.py.testLocals5.completion 
         |   7 +-
 16 files changed, 156 insertions(+), 41 deletions(-)

diffs (799 lines):

diff --git a/python.editor/external/binaries-list 
b/python.editor/external/binaries-list
--- a/python.editor/external/binaries-list
+++ b/python.editor/external/binaries-list
@@ -1,2 +1,2 @@
 37F7B79F965F6B917C4B318F5A5E446EC0BA83A5 pythonstubs-2_6.egg
-5E601DA4996AE21E1D4A7B94A9E1EDA2ACFF1FD5 preindexed.zip
+99A6A9A7982C42BF3F13FFFCD03796689BE09B15 preindexed.zip
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/PythonIndexer.java 
b/python.editor/src/org/netbeans/modules/python/editor/PythonIndexer.java
--- a/python.editor/src/org/netbeans/modules/python/editor/PythonIndexer.java
+++ b/python.editor/src/org/netbeans/modules/python/editor/PythonIndexer.java
@@ -191,7 +191,7 @@
     }
 
     public String getIndexVersion() {
-        return "0.115"; // NOI18N
+        return "0.116"; // NOI18N
     }
 
     public String getIndexerName() {
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/PythonUtils.java 
b/python.editor/src/org/netbeans/modules/python/editor/PythonUtils.java
--- a/python.editor/src/org/netbeans/modules/python/editor/PythonUtils.java
+++ b/python.editor/src/org/netbeans/modules/python/editor/PythonUtils.java
@@ -129,6 +129,14 @@
                                 if (FileUtil.isParentOf(root, fo)) {
                                     for (FileObject r : 
platform.getLibraryRoots()) {
                                         if (FileUtil.isParentOf(r, fo)) {
+                                            // See if the folder itself 
contains
+                                            // an __init__.py file - if it 
does,
+                                            // then include the directory 
itself
+                                            // in the package name.
+                                            if 
(r.getFileObject("__init__.py") != null) { // NOI18N
+                                                r = r.getParent();
+                                            }
+
                                             prevRootUrl = 
r.getURL().toExternalForm();
                                             found = true;
                                             break PlatformSearch;
@@ -149,6 +157,14 @@
                             for (SourceGroup group : sourceGroups) {
                                 FileObject folder = group.getRootFolder();
                                 if (FileUtil.isParentOf(folder, fo)) {
+                                    // See if the folder itself contains
+                                    // an __init__.py file - if it does,
+                                    // then include the directory itself
+                                    // in the package name.
+                                    if (folder.getFileObject("__init__.py") 
!= null) { // NOI18N
+                                        folder = folder.getParent();
+                                    }
+
                                     prevRootUrl = 
folder.getURL().toExternalForm();
                                     break;
                                 }
diff --git 
a/python.editor/test/unit/data/testfiles/ConfigParser.py.testClasses.completion
 
b/python.editor/test/unit/data/testfiles/ConfigParser.py.testClasses.completion
--- 
a/python.editor/test/unit/data/testfiles/ConfigParser.py.testClasses.completion
+++ 
b/python.editor/test/unit/data/testfiles/ConfigParser.py.testClasses.completion
@@ -35,7 +35,6 @@
 CLASS      AbstractHTTPHandler                        
 CLASS      AbstractWriter                             
 CLASS      Add                                        
-CLASS      AddressList                                
 CLASS      And                                        
 CLASS      Application                                
 CLASS      ArgumentError                              
@@ -448,7 +447,6 @@
 CLASS      InterpFormContentDict                      
 CLASS      InterpolationDepthError                    
 CLASS      InterpolationError                         
-CLASS      InterpolationMissingOptionErro  [PRIVATE]  
 CLASS      InterpolationSyntaxError                   
 CLASS      IntlText                                   
 CLASS      IntlWritingCode                            
@@ -464,7 +462,6 @@
 CLASS      IsqlCmd                                    
 CLASS      IsqlExit                                   
 CLASS      IterableUserDict                           
-CLASS      ItimerError                                
 CLASS      JSONDecoder                                
 CLASS      JSONEncoder                                
 CLASS      JavaSAXParser                              
@@ -474,6 +471,7 @@
 CLASS      JyErrorHandlerWrapper                      
 CLASS      JyInputSourceWrapper                       
 CLASS      JythonCompiler                             
+CLASS      JythonSignalHandler                        
 CLASS      KeyError                                   
 CLASS      KeyError                                   
 CLASS      KeyboardInterrupt                          
@@ -501,7 +499,6 @@
 CLASS      Listener                                   
 CLASS      LittleEndianStructure                      
 CLASS      LoadError                                  
-CLASS      LoadSet                                    
 CLASS      LocalNameFinder                            
 CLASS      Location                                   
 CLASS      Locator                                    
@@ -882,7 +879,6 @@
 CLASS      TypeInfo                                   
 CLASS      UDPServer                                  
 CLASS      URLError                                   
-CLASS      URLopener                                  
 CLASS      UUID                                       
 CLASS      UnaryAdd                                   
 CLASS      UnarySub                                   
@@ -1024,10 +1020,6 @@
 CLASS      dispatcher_with_send                       
 CLASS      error                                      
 CLASS      error_data                                 
-CLASS      error_perm                                 
-CLASS      error_proto                                
-CLASS      error_reply                                
-CLASS      error_temp                                 
 CLASS      excel                                      
 CLASS      excel_tab                                  
 CLASS      executor                                   
diff --git 
a/python.editor/test/unit/data/testfiles/ConfigParser.py.testImports1.completion
 
b/python.editor/test/unit/data/testfiles/ConfigParser.py.testImports1.completion
--- 
a/python.editor/test/unit/data/testfiles/ConfigParser.py.testImports1.completion
+++ 
b/python.editor/test/unit/data/testfiles/ConfigParser.py.testImports1.completion
@@ -58,7 +58,6 @@
 KEYWORD    __builtin__                                
 KEYWORD    __future__                                 
 KEYWORD    __main__                                   
-KEYWORD    _ast                                       
 KEYWORD    _rawffi                                    
 KEYWORD    _strptime                                  
 KEYWORD    _threading_local                           
@@ -115,6 +114,7 @@
 KEYWORD    compl3                                     
 KEYWORD    compl4                                     
 KEYWORD    compl5                                     
+KEYWORD    complete-calls                             
 KEYWORD    constants                                  
 KEYWORD    contextlib                                 
 KEYWORD    cookielib                                  
@@ -133,6 +133,7 @@
 KEYWORD    dbhash                                     
 KEYWORD    dbm                                        
 KEYWORD    decimal                                    
+KEYWORD    decorators                                 
 KEYWORD    difflib                                    
 KEYWORD    dircache                                   
 KEYWORD    dis                                        
@@ -224,6 +225,7 @@
 KEYWORD    email.test.test_email_torture              
 KEYWORD    email.utils                                
 KEYWORD    empty                                      
+KEYWORD    emptydecorators                            
 KEYWORD    encodings                                  
 KEYWORD    encodings.aliases                          
 KEYWORD    encodings.ascii                            
@@ -354,6 +356,7 @@
 KEYWORD    functions                                  
 KEYWORD    functools                                  
 KEYWORD    future_builtins                            
+KEYWORD    futureimport                               
 KEYWORD    gc                                         
 KEYWORD    gdbm                                       
 KEYWORD    gensuitemodule                             
@@ -393,7 +396,6 @@
 KEYWORD    itertools                                  
 KEYWORD    javapath                                   
 KEYWORD    javashell                                  
-KEYWORD    jreload                                    
 KEYWORD    json                                       
 KEYWORD    keyword                                    
 KEYWORD    lib2to3                                    
@@ -440,6 +442,7 @@
 KEYWORD    opcode                                     
 KEYWORD    operator                                   
 KEYWORD    optparse                                   
+KEYWORD    org                                        
 KEYWORD    os                                         
 KEYWORD    os.path                                    
 KEYWORD    ossaudiodev                                
@@ -620,8 +623,8 @@
 KEYWORD    xml.dom.minidom                            
 KEYWORD    xml.dom.pulldom                            
 KEYWORD    xml.dom.xmlbuilder                         
-KEYWORD    xml.etree                                  
 KEYWORD    xml.etree.ElementTree                      
+KEYWORD    xml.etree.cElementTree                     
 KEYWORD    xml.parsers.expat                          
 KEYWORD    xml.sax                                    
 KEYWORD    xml.sax._exceptions                        
diff --git 
a/python.editor/test/unit/data/testfiles/compl.py.testObjMethodCompletion1.completion
 
b/python.editor/test/unit/data/testfiles/compl.py.testObjMethodCompletion1.completion
--- 
a/python.editor/test/unit/data/testfiles/compl.py.testObjMethodCompletion1.completion
+++ 
b/python.editor/test/unit/data/testfiles/compl.py.testObjMethodCompletion1.completion
@@ -448,7 +448,6 @@
 CLASS      IsqlCmd                                    
 CLASS      IsqlExit                                   
 CLASS      IterableUserDict                           
-CLASS      ItimerError                                
 CLASS      JSONDecoder                                
 CLASS      JSONEncoder                                
 CLASS      JavaSAXParser                              
@@ -458,6 +457,7 @@
 CLASS      JyErrorHandlerWrapper                      
 CLASS      JyInputSourceWrapper                       
 CLASS      JythonCompiler                             
+CLASS      JythonSignalHandler                        
 CLASS      KeyError                                   
 CLASS      KeyError                                   
 CLASS      KeyboardInterrupt                          
@@ -485,7 +485,6 @@
 CLASS      Listener                                   
 CLASS      LittleEndianStructure                      
 CLASS      LoadError                                  
-CLASS      LoadSet                                    
 CLASS      LocalNameFinder                            
 CLASS      Location                                   
 CLASS      Locator                                    
@@ -681,6 +680,7 @@
 CLASS      Range                                      
 CLASS      RangeException                             
 CLASS      Rational                                   
+CLASS      RawConfigParser                            
 CLASS      RawIOBase                                  
 CLASS      RawTurtle                                  
 CLASS      ReadOnlySequentialNamedNodeMap             
@@ -728,7 +728,6 @@
 CLASS      SSLError                                   
 CLASS      SafeConfigParser                           
 CLASS      SafeTransport                              
-CLASS      Scanner                                    
 CLASS      Schema                                     
 CLASS      Scope                                      
 CLASS      Screen                                     
@@ -1006,6 +1005,8 @@
 CLASS      dispatcher_with_send                       
 CLASS      error                                      
 CLASS      error_data                                 
+CLASS      error_perm                                 
+CLASS      error_proto                                
 CLASS      error_temp                                 
 CLASS      excel                                      
 CLASS      excel_tab                                  
diff --git 
a/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodCompletion5.completion
 
b/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodCompletion5.completion
--- 
a/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodCompletion5.completion
+++ 
b/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodCompletion5.completion
@@ -375,23 +375,107 @@
 METHOD     runtime_library_dir_option(dir             
 METHOD     runtime_library_dir_option(dir             
 METHOD     runtime_library_dir_option(dir             
+VARIABLE   rargs                                      
+VARIABLE   raw                                        
+VARIABLE   raw_requestline                            
+VARIABLE   raw_requestline                            
+VARIABLE   rawdata                                    
+VARIABLE   rawdata                                    
+VARIABLE   rawdata                                    
+VARIABLE   rawq                                       
 VARIABLE   rbufsize                                   
 VARIABLE   rbufsize                                   
+VARIABLE   rc                                         
+VARIABLE   rcLines                                    
+VARIABLE   re_var                                     
 VARIABLE   read                                       
+VARIABLE   read                                       
+VARIABLE   read                                       
+VARIABLE   read                                       
+VARIABLE   read_func                                  
+VARIABLE   reader                                     
+VARIABLE   reader                                     
+VARIABLE   reader                                     
+VARIABLE   readfile                                   
 VARIABLE   readline                                   
+VARIABLE   readline                                   
+VARIABLE   readline                                   
+VARIABLE   readlines                                  
+VARIABLE   readlines                                  
+VARIABLE   realpos                                    
+VARIABLE   realsock                                   
+VARIABLE   reason                                     
+VARIABLE   reason                                     
+VARIABLE   recipients                                 
+VARIABLE   record                                     
+VARIABLE   records                                    
+VARIABLE   recv                                       
+VARIABLE   recvfrom                                   
 VARIABLE   reference                                  
+VARIABLE   relative                                   
+VARIABLE   relativeCreated                            
+VARIABLE   release                                    
+VARIABLE   repeat                                     
+VARIABLE   replace_paths                              
+VARIABLE   replace_whitespace                         
+VARIABLE   repository                                 
+VARIABLE   repository                                 
 VARIABLE   repr                                       
 VARIABLE   request                                    
 VARIABLE   request_queue_size                         
+VARIABLE   request_version                            
+VARIABLE   requestline                                
+VARIABLE   requires                                   
+VARIABLE   requires                                   
 VARIABLE   res_extension                              
 VARIABLE   res_extension                              
 VARIABLE   res_extension                              
+VARIABLE   reserved                                   
+VARIABLE   response                                   
 VARIABLE   response_class                             
 VARIABLE   responses                                  
+VARIABLE   restkey                                    
+VARIABLE   restval                                    
+VARIABLE   restype                                    
 VARIABLE   result                                     
+VARIABLE   results                                    
+VARIABLE   results                                    
+VARIABLE   retried                                    
+VARIABLE   retryFactor                                
+VARIABLE   retryMax                                   
+VARIABLE   retryPeriod                                
+VARIABLE   retryStart                                 
+VARIABLE   retryTime                                  
+VARIABLE   returncode                                 
+VARIABLE   returnframe                                
+VARIABLE   rfc2109                                    
+VARIABLE   rfc2109_as_netscape                        
+VARIABLE   rfc2965                                    
 VARIABLE   rfile                                      
+VARIABLE   right                                      
+VARIABLE   right                                      
+VARIABLE   right_list                                 
+VARIABLE   right_only                                 
+VARIABLE   rlen                                       
+VARIABLE   rng                                        
+VARIABLE   rng                                        
+VARIABLE   rolloverAt                                 
+VARIABLE   root                                       
+VARIABLE   root                                       
+VARIABLE   root                                       
+VARIABLE   roots                                      
+VARIABLE   rounding                                   
+VARIABLE   row                                        
+VARIABLE   rows                                       
+VARIABLE   rpath                                      
 VARIABLE   rpc_paths                                  
+VARIABLE   rpm3_mode                                  
+VARIABLE   rpm_base                                   
+VARIABLE   rs                                         
+VARIABLE   rulelines                                  
 VARIABLE   ruler                                      
+VARIABLE   runtime_library_dirs                       
+VARIABLE   runtime_library_dirs                       
 VARIABLE   rx                                         
 ATTRIBUTE  real                                       
 ATTRIBUTE  restype                                    
diff --git 
a/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodConstructors2.completion
 
b/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodConstructors2.completion
--- 
a/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodConstructors2.completion
+++ 
b/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodConstructors2.completion
@@ -12,4 +12,12 @@
 METHOD     testzip()                                  
 METHOD     write(filename, arcname, compr             
 METHOD     writestr(zinfo_or_arcname, byt             
+VARIABLE   NameToInfo                                 
+VARIABLE   comment                                    
+VARIABLE   compression                                
+VARIABLE   debug                                      
+VARIABLE   filelist                                   
+VARIABLE   filename                                   
 VARIABLE   fp                                         
+VARIABLE   mode                                       
+VARIABLE   start_dir                                  
diff --git 
a/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodConstructors3.completion
 
b/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodConstructors3.completion
--- 
a/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodConstructors3.completion
+++ 
b/python.editor/test/unit/data/testfiles/compl2.py.testObjMethodConstructors3.completion
@@ -11,4 +11,7 @@
 METHOD     failUnlessAlmostEqual(first, s             
 METHOD     failUnlessEqual(first, second,             
 METHOD     failUnlessRaises(excClass, cal             
+VARIABLE   fail                                       
 VARIABLE   failureException                           
+VARIABLE   failures                                   
+VARIABLE   failures                                   
diff --git 
a/python.editor/test/unit/data/testfiles/datetime.py.testLocals2.completion 
b/python.editor/test/unit/data/testfiles/datetime.py.testLocals2.completion
--- 
a/python.editor/test/unit/data/testfiles/datetime.py.testLocals2.completion
+++ 
b/python.editor/test/unit/data/testfiles/datetime.py.testLocals2.completion
@@ -495,7 +495,6 @@
 CLASS      IsqlCmd                                    
 CLASS      IsqlExit                                   
 CLASS      IterableUserDict                           
-CLASS      ItimerError                                
 CLASS      JSONDecoder                                
 CLASS      JSONEncoder                                
 CLASS      JavaSAXParser                              
@@ -505,6 +504,7 @@
 CLASS      JyErrorHandlerWrapper                      
 CLASS      JyInputSourceWrapper                       
 CLASS      JythonCompiler                             
+CLASS      JythonSignalHandler                        
 CLASS      KeyError                                   
 CLASS      KeyError                                   
 CLASS      KeyboardInterrupt                          
@@ -532,7 +532,6 @@
 CLASS      Listener                                   
 CLASS      LittleEndianStructure                      
 CLASS      LoadError                                  
-CLASS      LoadSet                                    
 CLASS      LocalNameFinder                            
 CLASS      Location                                   
 CLASS      Locator                                    
@@ -728,7 +727,6 @@
 CLASS      Range                                      
 CLASS      RangeException                             
 CLASS      Rational                                   
-CLASS      RawConfigParser                            
 CLASS      RawIOBase                                  
 CLASS      RawTurtle                                  
 CLASS      ReadOnlySequentialNamedNodeMap             
@@ -776,6 +774,7 @@
 CLASS      SSLError                                   
 CLASS      SafeConfigParser                           
 CLASS      SafeTransport                              
+CLASS      Scanner                                    
 CLASS      Schema                                     
 CLASS      Scope                                      
 CLASS      Screen                                     
@@ -912,6 +911,7 @@
 CLASS      TypeInfo                                   
 CLASS      UDPServer                                  
 CLASS      URLError                                   
+CLASS      URLopener                                  
 CLASS      UUID                                       
 CLASS      UnaryAdd                                   
 CLASS      UnarySub                                   
@@ -994,6 +994,7 @@
 CLASS      _CData                          [PROTECTE  
 CLASS      _FuncPtr                        [PROTECTE  
 CLASS      _SimpleCData                    [PROTECTE  
+CLASS      _date_class                     [PRIVATE]  
 CLASS      _posixfile_                                
 CLASS      array                                      
 CLASS      async_chat                                 
@@ -1053,8 +1054,9 @@
 CLASS      dispatcher_with_send                       
 CLASS      error                                      
 CLASS      error_data                                 
-CLASS      error_perm                                 
 CLASS      error_proto                                
+CLASS      error_reply                                
+CLASS      error_temp                                 
 CLASS      excel                                      
 CLASS      excel_tab                                  
 CLASS      executor                                   
diff --git 
a/python.editor/test/unit/data/testfiles/empty.py.testKeywords.completion 
b/python.editor/test/unit/data/testfiles/empty.py.testKeywords.completion
--- a/python.editor/test/unit/data/testfiles/empty.py.testKeywords.completion
+++ b/python.editor/test/unit/data/testfiles/empty.py.testKeywords.completion
@@ -258,6 +258,7 @@
 CLASS      Enum                                       
 CLASS      EnvironmentError                           
 CLASS      EnvironmentError                           
+CLASS      Error                                      
 CLASS      ErrorDuringImport                          
 CLASS      ErrorHandler                               
 CLASS      ErrorPrinter                               
@@ -443,7 +444,6 @@
 CLASS      IsqlCmd                                    
 CLASS      IsqlExit                                   
 CLASS      IterableUserDict                           
-CLASS      ItimerError                                
 CLASS      JSONDecoder                                
 CLASS      JSONEncoder                                
 CLASS      JavaSAXParser                              
@@ -453,6 +453,7 @@
 CLASS      JyErrorHandlerWrapper                      
 CLASS      JyInputSourceWrapper                       
 CLASS      JythonCompiler                             
+CLASS      JythonSignalHandler                        
 CLASS      KeyError                                   
 CLASS      KeyError                                   
 CLASS      KeyboardInterrupt                          
@@ -480,7 +481,6 @@
 CLASS      Listener                                   
 CLASS      LittleEndianStructure                      
 CLASS      LoadError                                  
-CLASS      LoadSet                                    
 CLASS      LocalNameFinder                            
 CLASS      Location                                   
 CLASS      Locator                                    
@@ -1001,7 +1001,6 @@
 CLASS      dispatcher_with_send                       
 CLASS      error                                      
 CLASS      error_data                                 
-CLASS      error_perm                                 
 CLASS      error_proto                                
 CLASS      error_reply                                
 CLASS      excel                                      
diff --git 
a/python.editor/test/unit/data/testfiles/imports3.py.testImports3.completion 
b/python.editor/test/unit/data/testfiles/imports3.py.testImports3.completion
--- 
a/python.editor/test/unit/data/testfiles/imports3.py.testImports3.completion
+++ 
b/python.editor/test/unit/data/testfiles/imports3.py.testImports3.completion
@@ -58,7 +58,6 @@
 KEYWORD    __builtin__                                
 KEYWORD    __future__                                 
 KEYWORD    __main__                                   
-KEYWORD    _ast                                       
 KEYWORD    _rawffi                                    
 KEYWORD    _strptime                                  
 KEYWORD    _threading_local                           
@@ -115,6 +114,7 @@
 KEYWORD    compl3                                     
 KEYWORD    compl4                                     
 KEYWORD    compl5                                     
+KEYWORD    complete-calls                             
 KEYWORD    constants                                  
 KEYWORD    contextlib                                 
 KEYWORD    cookielib                                  
@@ -133,6 +133,7 @@
 KEYWORD    dbhash                                     
 KEYWORD    dbm                                        
 KEYWORD    decimal                                    
+KEYWORD    decorators                                 
 KEYWORD    difflib                                    
 KEYWORD    dircache                                   
 KEYWORD    dis                                        
@@ -223,6 +224,7 @@
 KEYWORD    email.quoprimime                           
 KEYWORD    email.test.test_email_torture              
 KEYWORD    email.utils                                
+KEYWORD    emptydecorators                            
 KEYWORD    encodings                                  
 KEYWORD    encodings.aliases                          
 KEYWORD    encodings.ascii                            
@@ -353,6 +355,7 @@
 KEYWORD    functions                                  
 KEYWORD    functools                                  
 KEYWORD    future_builtins                            
+KEYWORD    futureimport                               
 KEYWORD    gc                                         
 KEYWORD    gdbm                                       
 KEYWORD    gensuitemodule                             
@@ -389,7 +392,6 @@
 KEYWORD    itertools                                  
 KEYWORD    javapath                                   
 KEYWORD    javashell                                  
-KEYWORD    jreload                                    
 KEYWORD    json                                       
 KEYWORD    keyword                                    
 KEYWORD    lib2to3                                    
@@ -436,6 +438,7 @@
 KEYWORD    opcode                                     
 KEYWORD    operator                                   
 KEYWORD    optparse                                   
+KEYWORD    org                                        
 KEYWORD    os                                         
 KEYWORD    os.path                                    
 KEYWORD    ossaudiodev                                
@@ -616,8 +619,8 @@
 KEYWORD    xml.dom.minidom                            
 KEYWORD    xml.dom.pulldom                            
 KEYWORD    xml.dom.xmlbuilder                         
-KEYWORD    xml.etree                                  
 KEYWORD    xml.etree.ElementTree                      
+KEYWORD    xml.etree.cElementTree                     
 KEYWORD    xml.parsers.expat                          
 KEYWORD    xml.sax                                    
 KEYWORD    xml.sax._exceptions                        
diff --git 
a/python.editor/test/unit/data/testfiles/imports4.py.testImports4.completion 
b/python.editor/test/unit/data/testfiles/imports4.py.testImports4.completion
--- 
a/python.editor/test/unit/data/testfiles/imports4.py.testImports4.completion
+++ 
b/python.editor/test/unit/data/testfiles/imports4.py.testImports4.completion
@@ -58,7 +58,6 @@
 KEYWORD    __builtin__                                
 KEYWORD    __future__                                 
 KEYWORD    __main__                                   
-KEYWORD    _ast                                       
 KEYWORD    _rawffi                                    
 KEYWORD    _strptime                                  
 KEYWORD    _threading_local                           
@@ -115,6 +114,7 @@
 KEYWORD    compl3                                     
 KEYWORD    compl4                                     
 KEYWORD    compl5                                     
+KEYWORD    complete-calls                             
 KEYWORD    constants                                  
 KEYWORD    contextlib                                 
 KEYWORD    cookielib                                  
@@ -133,6 +133,7 @@
 KEYWORD    dbhash                                     
 KEYWORD    dbm                                        
 KEYWORD    decimal                                    
+KEYWORD    decorators                                 
 KEYWORD    difflib                                    
 KEYWORD    dircache                                   
 KEYWORD    dis                                        
@@ -223,6 +224,7 @@
 KEYWORD    email.quoprimime                           
 KEYWORD    email.test.test_email_torture              
 KEYWORD    email.utils                                
+KEYWORD    emptydecorators                            
 KEYWORD    encodings                                  
 KEYWORD    encodings.aliases                          
 KEYWORD    encodings.ascii                            
@@ -353,6 +355,7 @@
 KEYWORD    functions                                  
 KEYWORD    functools                                  
 KEYWORD    future_builtins                            
+KEYWORD    futureimport                               
 KEYWORD    gc                                         
 KEYWORD    gdbm                                       
 KEYWORD    gensuitemodule                             
@@ -390,7 +393,6 @@
 KEYWORD    itertools                                  
 KEYWORD    javapath                                   
 KEYWORD    javashell                                  
-KEYWORD    jreload                                    
 KEYWORD    json                                       
 KEYWORD    keyword                                    
 KEYWORD    lib2to3                                    
@@ -437,6 +439,7 @@
 KEYWORD    opcode                                     
 KEYWORD    operator                                   
 KEYWORD    optparse                                   
+KEYWORD    org                                        
 KEYWORD    os                                         
 KEYWORD    os.path                                    
 KEYWORD    ossaudiodev                                
@@ -617,8 +620,8 @@
 KEYWORD    xml.dom.minidom                            
 KEYWORD    xml.dom.pulldom                            
 KEYWORD    xml.dom.xmlbuilder                         
-KEYWORD    xml.etree                                  
 KEYWORD    xml.etree.ElementTree                      
+KEYWORD    xml.etree.cElementTree                     
 KEYWORD    xml.parsers.expat                          
 KEYWORD    xml.sax                                    
 KEYWORD    xml.sax._exceptions                        
diff --git 
a/python.editor/test/unit/data/testfiles/imports6.py.testImports6.completion 
b/python.editor/test/unit/data/testfiles/imports6.py.testImports6.completion
--- 
a/python.editor/test/unit/data/testfiles/imports6.py.testImports6.completion
+++ 
b/python.editor/test/unit/data/testfiles/imports6.py.testImports6.completion
@@ -58,7 +58,6 @@
 KEYWORD    __builtin__                                
 KEYWORD    __future__                                 
 KEYWORD    __main__                                   
-KEYWORD    _ast                                       
 KEYWORD    _rawffi                                    
 KEYWORD    _strptime                                  
 KEYWORD    _threading_local                           
@@ -115,6 +114,7 @@
 KEYWORD    compl3                                     
 KEYWORD    compl4                                     
 KEYWORD    compl5                                     
+KEYWORD    complete-calls                             
 KEYWORD    constants                                  
 KEYWORD    contextlib                                 
 KEYWORD    cookielib                                  
@@ -133,6 +133,7 @@
 KEYWORD    dbhash                                     
 KEYWORD    dbm                                        
 KEYWORD    decimal                                    
+KEYWORD    decorators                                 
 KEYWORD    difflib                                    
 KEYWORD    dircache                                   
 KEYWORD    dis                                        
@@ -223,6 +224,7 @@
 KEYWORD    email.quoprimime                           
 KEYWORD    email.test.test_email_torture              
 KEYWORD    email.utils                                
+KEYWORD    emptydecorators                            
 KEYWORD    encodings                                  
 KEYWORD    encodings.aliases                          
 KEYWORD    encodings.ascii                            
@@ -353,6 +355,7 @@
 KEYWORD    functions                                  
 KEYWORD    functools                                  
 KEYWORD    future_builtins                            
+KEYWORD    futureimport                               
 KEYWORD    gc                                         
 KEYWORD    gdbm                                       
 KEYWORD    gensuitemodule                             
@@ -392,7 +395,6 @@
 KEYWORD    itertools                                  
 KEYWORD    javapath                                   
 KEYWORD    javashell                                  
-KEYWORD    jreload                                    
 KEYWORD    json                                       
 KEYWORD    keyword                                    
 KEYWORD    lib2to3                                    
@@ -439,6 +441,7 @@
 KEYWORD    opcode                                     
 KEYWORD    operator                                   
 KEYWORD    optparse                                   
+KEYWORD    org                                        
 KEYWORD    os                                         
 KEYWORD    os.path                                    
 KEYWORD    ossaudiodev                                
@@ -619,8 +622,8 @@
 KEYWORD    xml.dom.minidom                            
 KEYWORD    xml.dom.pulldom                            
 KEYWORD    xml.dom.xmlbuilder                         
-KEYWORD    xml.etree                                  
 KEYWORD    xml.etree.ElementTree                      
+KEYWORD    xml.etree.cElementTree                     
 KEYWORD    xml.parsers.expat                          
 KEYWORD    xml.sax                                    
 KEYWORD    xml.sax._exceptions                        
diff --git 
a/python.editor/test/unit/data/testfiles/occurrences2.py.testLocals4.completion
 
b/python.editor/test/unit/data/testfiles/occurrences2.py.testLocals4.completion
--- 
a/python.editor/test/unit/data/testfiles/occurrences2.py.testLocals4.completion
+++ 
b/python.editor/test/unit/data/testfiles/occurrences2.py.testLocals4.completion
@@ -29,6 +29,7 @@
 CLASS      AbstractHTTPHandler                        
 CLASS      AbstractWriter                             
 CLASS      Add                                        
+CLASS      AddressList                                
 CLASS      And                                        
 CLASS      Application                                
 CLASS      ArgumentError                              
@@ -456,7 +457,6 @@
 CLASS      IsqlCmd                                    
 CLASS      IsqlExit                                   
 CLASS      IterableUserDict                           
-CLASS      ItimerError                                
 CLASS      JSONDecoder                                
 CLASS      JSONEncoder                                
 CLASS      JavaSAXParser                              
@@ -466,6 +466,7 @@
 CLASS      JyErrorHandlerWrapper                      
 CLASS      JyInputSourceWrapper                       
 CLASS      JythonCompiler                             
+CLASS      JythonSignalHandler                        
 CLASS      KeyError                                   
 CLASS      KeyError                                   
 CLASS      KeyboardInterrupt                          
@@ -493,7 +494,6 @@
 CLASS      Listener                                   
 CLASS      LittleEndianStructure                      
 CLASS      LoadError                                  
-CLASS      LoadSet                                    
 CLASS      LocalNameFinder                            
 CLASS      Location                                   
 CLASS      Locator                                    
@@ -689,7 +689,6 @@
 CLASS      Range                                      
 CLASS      RangeException                             
 CLASS      Rational                                   
-CLASS      RawConfigParser                            
 CLASS      RawIOBase                                  
 CLASS      RawTurtle                                  
 CLASS      ReadOnlySequentialNamedNodeMap             
@@ -1015,8 +1014,8 @@
 CLASS      dispatcher_with_send                       
 CLASS      error                                      
 CLASS      error_data                                 
+CLASS      error_perm                                 
 CLASS      error_proto                                
-CLASS      error_reply                                
 CLASS      error_temp                                 
 CLASS      excel                                      
 CLASS      excel_tab                                  
diff --git 
a/python.editor/test/unit/data/testfiles/occurrences2.py.testLocals5.completion
 
b/python.editor/test/unit/data/testfiles/occurrences2.py.testLocals5.completion
--- 
a/python.editor/test/unit/data/testfiles/occurrences2.py.testLocals5.completion
+++ 
b/python.editor/test/unit/data/testfiles/occurrences2.py.testLocals5.completion
@@ -28,7 +28,6 @@
 CLASS      AbstractHTTPHandler                        
 CLASS      AbstractWriter                             
 CLASS      Add                                        
-CLASS      AddressList                                
 CLASS      And                                        
 CLASS      Application                                
 CLASS      ArgumentError                              
@@ -455,7 +454,6 @@
 CLASS      IsqlCmd                                    
 CLASS      IsqlExit                                   
 CLASS      IterableUserDict                           
-CLASS      ItimerError                                
 CLASS      JSONDecoder                                
 CLASS      JSONEncoder                                
 CLASS      JavaSAXParser                              
@@ -465,6 +463,7 @@
 CLASS      JyErrorHandlerWrapper                      
 CLASS      JyInputSourceWrapper                       
 CLASS      JythonCompiler                             
+CLASS      JythonSignalHandler                        
 CLASS      KeyError                                   
 CLASS      KeyError                                   
 CLASS      KeyboardInterrupt                          
@@ -492,7 +491,6 @@
 CLASS      Listener                                   
 CLASS      LittleEndianStructure                      
 CLASS      LoadError                                  
-CLASS      LoadSet                                    
 CLASS      LocalNameFinder                            
 CLASS      Location                                   
 CLASS      Locator                                    
@@ -688,6 +686,7 @@
 CLASS      Range                                      
 CLASS      RangeException                             
 CLASS      Rational                                   
+CLASS      RawConfigParser                            
 CLASS      RawIOBase                                  
 CLASS      RawTurtle                                  
 CLASS      ReadOnlySequentialNamedNodeMap             
@@ -1013,8 +1012,8 @@
 CLASS      dispatcher_with_send                       
 CLASS      error                                      
 CLASS      error_data                                 
+CLASS      error_proto                                
 CLASS      error_reply                                
-CLASS      error_temp                                 
 CLASS      excel                                      
 CLASS      excel_tab                                  
 CLASS      executor                                   

[[nbpython-commits]] [hg] main/contrib: Improve computation of Python module names to...

Tor Norbye 10/21/2010

Project Features

About this Project

www was started in November 2009, is owned by jpirek, and has 25 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20150226.965aeb8). © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close