mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 10:16:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 79576-79578 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79576 | florent.xicluna | 2010-04-02 10:24:52 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: Fix additional "-3" warnings in the idlelib package, and convert to absolute imports.
........
  r79577 | florent.xicluna | 2010-04-02 11:15:26 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: Drop the cmp argument.
........
  r79578 | florent.xicluna | 2010-04-02 11:30:21 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: silence some py3k warnings
........
This commit is contained in:
Ezio Melotti 2010-08-02 20:40:20 +00:00
parent b55d368055
commit 4c6daf1037
37 changed files with 173 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/idlelib/AutoComplete.py
View file

@ -7,12 +7,7 @@ import os
import sys
import string
from configHandler import idleConf
import AutoCompleteWindow
from HyperParser import HyperParser
import __main__
from idlelib.configHandler import idleConf
# This string includes all chars that may be in a file name (without a path
# separator)
@ -23,6 +18,11 @@ ID_CHARS = string.ascii_letters + string.digits + "_"
# These constants represent the two different types of completions
COMPLETE_ATTRIBUTES, COMPLETE_FILES = range(1, 2+1)
from idlelib import AutoCompleteWindow
from idlelib.HyperParser import HyperParser
import __main__
SEPS = os.sep
if os.altsep: # e.g. '/' on Windows...
SEPS += os.altsep
@ -193,7 +193,7 @@ class AutoComplete:
smalll = eval("__all__", namespace)
smalll.sort()
else:
smalll = filter(lambda s: s[:1] != '_', bigl)
smalll = [s for s in bigl if s[:1] != '_']
else:
try:
entity = self.get_entity(what)
@ -203,7 +203,7 @@ class AutoComplete:
smalll = entity.__all__
smalll.sort()
else:
smalll = filter(lambda s: s[:1] != '_', bigl)
smalll = [s for s in bigl if s[:1] != '_']
except:
return [], []
@ -214,7 +214,7 @@ class AutoComplete:
expandedpath = os.path.expanduser(what)
bigl = os.listdir(expandedpath)
bigl.sort()
smalll = filter(lambda s: s[:1] != '.', bigl)
smalll = [s for s in bigl if s[:1] != '.']
except OSError:
return [], []