[Python-checkins] cpython (2.7): Issue #27238: Got rid of bare excepts in the turtle module. Original patch

Tue Jun 14 15:55:04 EDT 2016

https://hg.python.org/cpython/rev/e9d023b7d676
changeset: 102043:e9d023b7d676
branch: 2.7
parent: 102021:ac7c10f5e36e
user: Serhiy Storchaka <storchaka at gmail.com>
date: Tue Jun 14 22:52:13 2016 +0300
summary:
 Issue #27238: Got rid of bare excepts in the turtle module. Original patch
by Jelle Zijlstra.
files:
 Lib/lib-tk/turtle.py | 18 +++++++++---------
 Misc/ACKS | 1 +
 Misc/NEWS | 3 +++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py
--- a/Lib/lib-tk/turtle.py
+++ b/Lib/lib-tk/turtle.py
@@ -192,7 +192,7 @@
 continue
 try:
 key, value = line.split("=")
- except:
+ except ValueError:
 print "Bad line in config-file %s:\n%s" % (filename,line)
 continue
 key = key.strip()
@@ -205,7 +205,7 @@
 value = float(value)
 else:
 value = int(value)
- except:
+ except ValueError:
 pass # value need not be converted
 cfgdict[key] = value
 return cfgdict
@@ -234,7 +234,7 @@
 try:
 head, tail = split(__file__)
 cfg_file2 = join(head, default_cfg)
- except:
+ except BaseException:
 cfg_file2 = ""
 if isfile(cfg_file2):
 #print "2. Loading config-file %s:" % cfg_file2
@@ -249,7 +249,7 @@
 
 try:
 readconfig(_CFG)
-except:
+except BaseException:
 print "No configfile read, reason unknown"
 
 
@@ -677,7 +677,7 @@
 x, y = (self.cv.canvasx(event.x)/self.xscale,
 -self.cv.canvasy(event.y)/self.yscale)
 fun(x, y)
- except:
+ except BaseException:
 pass
 self.cv.tag_bind(item, "<Button%s-Motion>" % num, eventfun, add)
 
@@ -1105,7 +1105,7 @@
 raise TurtleGraphicsError("bad color string: %s" % str(color))
 try:
 r, g, b = color
- except:
+ except (TypeError, ValueError):
 raise TurtleGraphicsError("bad color arguments: %s" % str(color))
 if self._colormode == 1.0:
 r, g, b = [round(255.0*x) for x in (r, g, b)]
@@ -2606,7 +2606,7 @@
 return args
 try:
 r, g, b = args
- except:
+ except (TypeError, ValueError):
 raise TurtleGraphicsError("bad color arguments: %s" % str(args))
 if self.screen._colormode == 1.0:
 r, g, b = [round(255.0*x) for x in (r, g, b)]
@@ -3755,7 +3755,7 @@
 #print key
 try:
 eval(key).im_func.__doc__ = docsdict[key]
- except:
+ except BaseException:
 print "Bad docstring-entry: %s" % key
 
 _LANGUAGE = _CFG["language"]
@@ -3765,7 +3765,7 @@
 read_docstrings(_LANGUAGE)
 except ImportError:
 print "Cannot find docsdict for", _LANGUAGE
-except:
+except BaseException:
 print ("Unknown Error when trying to import %s-docstring-dictionary" %
 _LANGUAGE)
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1554,5 +1554,6 @@
 Cheng Zhang
 Kai Zhu
 Tarek Ziadé
+Jelle Zijlstra
 Gennadiy Zlobin
 Peter Åstrand
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@
 Library
 -------
 
+- Issue #27238: Got rid of bare excepts in the turtle module. Original patch
+ by Jelle Zijlstra.
+
 - Issue #26386: Fixed ttk.TreeView selection operations with item id's
 containing spaces.
 
-- 
Repository URL: https://hg.python.org/cpython
