Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Replace os.error with OSError in tkinter and IDLE

This commit is contained in:
Andrew Svetlov 2012-12-17 19:51:15 +02:00
parent 69d03c4799
commit 786fbd8db7
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/idlelib/FileList.py
View File

@ -103,7 +103,7 @@ class FileList:
if not os.path.isabs(filename):
try:
pwd = os.getcwd()
except os.error:
except OSError:
pass
else:
filename = os.path.join(pwd, filename)

2
Lib/idlelib/GrepDialog.py
View File

@ -110,7 +110,7 @@ class GrepDialog(SearchDialogBase):
def findfiles(self, dir, base, rec):
try:
names = os.listdir(dir or os.curdir)
except os.error as msg:
except OSError as msg:
print(msg)
return []
list = []

2
Lib/idlelib/IOBinding.py
View File

@ -503,7 +503,7 @@ class IOBinding:
else:
try:
pwd = os.getcwd()
except os.error:
except OSError:
pwd = ""
return pwd, ""

2
Lib/idlelib/PathBrowser.py
View File

@ -45,7 +45,7 @@ class DirBrowserTreeItem(TreeItem):
def GetSubList(self):
try:
names = os.listdir(self.dir or os.curdir)
except os.error:
except OSError:
return []
packages = []
for name in names:

4
Lib/idlelib/TreeWidget.py
View File

@ -382,7 +382,7 @@ class FileTreeItem(TreeItem):
try:
os.rename(self.path, newpath)
self.path = newpath
except os.error:
except OSError:
pass
def GetIconName(self):
@ -395,7 +395,7 @@ class FileTreeItem(TreeItem):
def GetSubList(self):
try:
names = os.listdir(self.path)
except os.error:
except OSError:
return []
names.sort(key = os.path.normcase)
sublist = []

4
Lib/tkinter/filedialog.py
View File

@ -166,7 +166,7 @@ class FileDialog:
dir, pat = self.get_filter()
try:
names = os.listdir(dir)
except os.error:
except OSError:
self.master.bell()
return
self.directory = dir
@ -209,7 +209,7 @@ class FileDialog:
if not os.path.isabs(dir):
try:
pwd = os.getcwd()
except os.error:
except OSError:
pwd = None
if pwd:
dir = os.path.join(pwd, dir)