mirror of
https://github.com/python/cpython.git
synced 2025-07-19 17:25:54 +00:00
* Fix bug in tzparse.py for DST timezone
* Added whatis command to pdb.py * new module GET.py (GL definitions from <gl/get.h>) * rect.py: is_empty takes a rect as argument, not two points. * Added tests for builtin round() [XXX not yet complete!]
This commit is contained in:
parent
04321d1e47
commit
e7113b6b3d
7 changed files with 51 additions and 9 deletions
|
@ -17,7 +17,8 @@ empty = (0, 0), (0, 0)
|
|||
|
||||
# Check if a rectangle is empty.
|
||||
#
|
||||
def is_empty((left, top), (right, bottom)):
|
||||
def is_empty(r):
|
||||
(left, top), (right, bottom) = r
|
||||
return left >= right or top >= bottom
|
||||
|
||||
|
||||
|
@ -36,7 +37,7 @@ def intersect(list):
|
|||
if top < t: top = t
|
||||
if right > r: right = r
|
||||
if bottom > b: bottom = b
|
||||
if is_empty((left, top), (right, bottom)):
|
||||
if is_empty(((left, top), (right, bottom))):
|
||||
return empty
|
||||
return (left, top), (right, bottom)
|
||||
|
||||
|
@ -47,7 +48,7 @@ def intersect(list):
|
|||
def union(list):
|
||||
(left, top), (right, bottom) = empty
|
||||
for (l, t), (r, b) in list[1:]:
|
||||
if not is_empty((l, t), (r, b)):
|
||||
if not is_empty(((l, t), (r, b))):
|
||||
if l < left: left = l
|
||||
if t < top: top = t
|
||||
if r > right: right = r
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue