Make magic coordinates more readable
diff --git a/Lib/curses/textpad.py b/Lib/curses/textpad.py
index bfc270a..cd4813b 100644
--- a/Lib/curses/textpad.py
+++ b/Lib/curses/textpad.py
@@ -3,7 +3,9 @@
import curses, ascii
def rectangle(win, uly, ulx, lry, lrx):
- "Draw a rectangle."
+ """Draw a rectangle with corners at the provided upper-left
+ and lower-right coordinates.
+ """
win.vline(uly+1, ulx, curses.ACS_VLINE, lry - uly - 1)
win.hline(uly, ulx+1, curses.ACS_HLINE, lrx - ulx - 1)
win.hline(lry, ulx+1, curses.ACS_HLINE, lrx - ulx - 1)
@@ -157,8 +159,10 @@
if __name__ == '__main__':
def test_editbox(stdscr):
- win = curses.newwin(4, 9, 15, 20)
- rectangle(stdscr, 14, 19, 19, 29)
+ ncols, nlines = 9, 4
+ uly, ulx = 15, 20
+ win = curses.newwin(nlines, ncols, uly, ulx)
+ rectangle(stdscr, uly-1, ulx-1, uly + nlines, ulx + ncols)
stdscr.refresh()
return Textbox(win).edit()