From 124eb94270420a20ab4b296a60b6cc508d9d950c Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 26 Oct 1990 13:44:32 +0000 Subject: [PATCH] Fix bug in rect.intersect(): empty rects beyond the first were ignored instead of making the outcome empty... --- Lib/lib-stdwin/rect.py | 17 +++++++++-------- Lib/stdwin/rect.py | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Lib/lib-stdwin/rect.py b/Lib/lib-stdwin/rect.py index c044b9f0c71..aa5ff4449b7 100644 --- a/Lib/lib-stdwin/rect.py +++ b/Lib/lib-stdwin/rect.py @@ -29,14 +29,15 @@ def intersect(list): if is_empty(list[0]): return empty (left, top), (right, bottom) = list[0] for rect in list[1:]: - if not is_empty(rect): - (l, t), (r, b) = rect - if left < l: left = l - if top < t: top = t - if right > r: right = r - if bottom > b: bottom = b - if is_empty((left, top), (right, bottom)): - return empty + if is_empty(rect): + return empty + (l, t), (r, b) = rect + if left < l: left = l + if top < t: top = t + if right > r: right = r + if bottom > b: bottom = b + if is_empty((left, top), (right, bottom)): + return empty return (left, top), (right, bottom) diff --git a/Lib/stdwin/rect.py b/Lib/stdwin/rect.py index c044b9f0c71..aa5ff4449b7 100755 --- a/Lib/stdwin/rect.py +++ b/Lib/stdwin/rect.py @@ -29,14 +29,15 @@ def intersect(list): if is_empty(list[0]): return empty (left, top), (right, bottom) = list[0] for rect in list[1:]: - if not is_empty(rect): - (l, t), (r, b) = rect - if left < l: left = l - if top < t: top = t - if right > r: right = r - if bottom > b: bottom = b - if is_empty((left, top), (right, bottom)): - return empty + if is_empty(rect): + return empty + (l, t), (r, b) = rect + if left < l: left = l + if top < t: top = t + if right > r: right = r + if bottom > b: bottom = b + if is_empty((left, top), (right, bottom)): + return empty return (left, top), (right, bottom)