Mailman 3 June 2014 - Python-checkins

cpython (merge 3.4 -> default): Merge with 3.4
by terry.reedy June 30, 2014

June 30, 2014

http://hg.python.org/cpython/rev/3134189655b1 changeset: 91489:3134189655b1 parent: 91486:2d0fa8f383c8 parent: 91488:fcfa9c5a00fd user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Mon Jun 30 16:09:44 2014 -0400 summary: Merge with 3.4 files: Lib/turtle.py | 2 +- Lib/turtledemo/clock.py | 6 +- Lib/turtledemo/colormixer.py | 2 - Lib/turtledemo/demohelp.txt | 5 +- Lib/turtledemo/minimal_hanoi.py | 1 - Lib/turtledemo/nim.py | 10 +- Lib/turtledemo/two_canvases.py | 80 +++++++++----------- 7 files changed, 48 insertions(+), 58 deletions(-) diff --git a/Lib/turtle.py b/Lib/turtle.py --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -140,7 +140,7 @@ _tg_utilities = ['write_docstringdict', 'done'] __all__ = (_tg_classes + _tg_screen_functions + _tg_turtle_functions + - _tg_utilities) # + _math_functions) + _tg_utilities + ['Terminator']) # + _math_functions) _alias_list = ['addshape', 'backward', 'bk', 'fd', 'ht', 'lt', 'pd', 'pos', 'pu', 'rt', 'seth', 'setpos', 'setposition', 'st', diff --git a/Lib/turtledemo/clock.py b/Lib/turtledemo/clock.py --- a/Lib/turtledemo/clock.py +++ b/Lib/turtledemo/clock.py @@ -11,11 +11,8 @@ ------------------------------------ """ from turtle import * -from turtle import Terminator # not in __all__ from datetime import datetime -mode("logo") - def jump(distanz, winkel=0): penup() right(winkel) @@ -43,7 +40,6 @@ hand_form = get_poly() register_shape(name, hand_form) - def clockface(radius): reset() pensize(7) @@ -84,7 +80,6 @@ writer.pu() writer.bk(85) - def wochentag(t): wochentag = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"] @@ -131,6 +126,7 @@ return "EVENTLOOP" if __name__ == "__main__": + mode("logo") msg = main() print(msg) mainloop() diff --git a/Lib/turtledemo/colormixer.py b/Lib/turtledemo/colormixer.py --- a/Lib/turtledemo/colormixer.py +++ b/Lib/turtledemo/colormixer.py @@ -1,8 +1,6 @@ # colormixer from turtle import Screen, Turtle, mainloop -import sys -sys.setrecursionlimit(20000) # overcomes, for now, an instability of Python 3.0 class ColorTurtle(Turtle): diff --git a/Lib/turtledemo/demohelp.txt b/Lib/turtledemo/demohelp.txt --- a/Lib/turtledemo/demohelp.txt +++ b/Lib/turtledemo/demohelp.txt @@ -54,6 +54,9 @@ (2) How to add your own demos to the demo repository - Place the file in the same directory as turtledemo/__main__.py + IMPORTANT! When imported, the demo should not modify the system + by calling functions in other modules, such as sys, tkinter, or + turtle. Global variables should be initialized in main(). - The code must contain a main() function which will be executed by the viewer (see provided example scripts). @@ -65,7 +68,7 @@ if __name__ == '__main__': main() - mainloop() # keep window + mainloop() # keep window open python -m turtledemo.mydemo # will then run it diff --git a/Lib/turtledemo/minimal_hanoi.py b/Lib/turtledemo/minimal_hanoi.py --- a/Lib/turtledemo/minimal_hanoi.py +++ b/Lib/turtledemo/minimal_hanoi.py @@ -18,7 +18,6 @@ --------------------------------------- """ from turtle import * -from turtle import Terminator # not in __all__ class Disc(Turtle): def __init__(self, n): diff --git a/Lib/turtledemo/nim.py b/Lib/turtledemo/nim.py --- a/Lib/turtledemo/nim.py +++ b/Lib/turtledemo/nim.py @@ -143,7 +143,6 @@ self.writer.write(msg1, align="center", font=("Courier",14,"bold")) self.screen.tracer(True) - def setup(self): self.screen.tracer(False) for row in range(3): @@ -181,6 +180,7 @@ if self.game.state == Nim.OVER: self.screen.clear() + class NimController(object): def __init__(self, game): @@ -201,6 +201,7 @@ self.game.model.notify_move(row, col) self.BUSY = False + class Nim(object): CREATED = 0 RUNNING = 1 @@ -213,11 +214,10 @@ self.controller = NimController(self) -mainscreen = turtle.Screen() -mainscreen.mode("standard") -mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) - def main(): + mainscreen = turtle.Screen() + mainscreen.mode("standard") + mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) nim = Nim(mainscreen) return "EVENTLOOP!" diff --git a/Lib/turtledemo/two_canvases.py b/Lib/turtledemo/two_canvases.py --- a/Lib/turtledemo/two_canvases.py +++ b/Lib/turtledemo/two_canvases.py @@ -1,60 +1,54 @@ """turtledemo.two_canvases Use TurtleScreen and RawTurtle to draw on two -distinct canvases. +distinct canvases in a separate windows. The +new window must be separately closed in +addition to pressing the STOP button. """ -#The final mainloop only serves to keep the window open. - -#TODO: This runs in its own two-canvas window when selected in the -#demoviewer examples menu but the text is not loaded and the previous -#example is left visible. If the ending mainloop is removed, the text -#Eis loaded, this run again in a third window, and if start is pressed, -#demoviewer raises an error because main is not found, and then freezes. from turtle import TurtleScreen, RawTurtle, TK -root = TK.Tk() -cv1 = TK.Canvas(root, width=300, height=200, bg="#ddffff") -cv2 = TK.Canvas(root, width=300, height=200, bg="#ffeeee") -cv1.pack() -cv2.pack() +def main(): + root = TK.Tk() + cv1 = TK.Canvas(root, width=300, height=200, bg="#ddffff") + cv2 = TK.Canvas(root, width=300, height=200, bg="#ffeeee") + cv1.pack() + cv2.pack() -s1 = TurtleScreen(cv1) -s1.bgcolor(0.85, 0.85, 1) -s2 = TurtleScreen(cv2) -s2.bgcolor(1, 0.85, 0.85) + s1 = TurtleScreen(cv1) + s1.bgcolor(0.85, 0.85, 1) + s2 = TurtleScreen(cv2) + s2.bgcolor(1, 0.85, 0.85) -p = RawTurtle(s1) -q = RawTurtle(s2) + p = RawTurtle(s1) + q = RawTurtle(s2) -p.color("red", (1, 0.85, 0.85)) -p.width(3) -q.color("blue", (0.85, 0.85, 1)) -q.width(3) + p.color("red", (1, 0.85, 0.85)) + p.width(3) + q.color("blue", (0.85, 0.85, 1)) + q.width(3) -for t in p,q: - t.shape("turtle") - t.lt(36) + for t in p,q: + t.shape("turtle") + t.lt(36) -q.lt(180) + q.lt(180) -for t in p, q: - t.begin_fill() -for i in range(5): for t in p, q: - t.fd(50) - t.lt(72) -for t in p,q: - t.end_fill() - t.lt(54) - t.pu() - t.bk(50) + t.begin_fill() + for i in range(5): + for t in p, q: + t.fd(50) + t.lt(72) + for t in p,q: + t.end_fill() + t.lt(54) + t.pu() + t.bk(50) -## Want to get some info? + return "EVENTLOOP" -#print(s1, s2) -#print(p, q) -#print(s1.turtles()) -#print(s2.turtles()) -TK.mainloop() +if __name__ == '__main__': + main() + TK.mainloop() # keep window open until user closes it -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Issue #21882: In turtle demos, remove module scope gui and sys calls by
by terry.reedy June 30, 2014

June 30, 2014

http://hg.python.org/cpython/rev/fcfa9c5a00fd changeset: 91488:fcfa9c5a00fd branch: 3.4 parent: 91485:13e78b9cf290 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Mon Jun 30 16:09:24 2014 -0400 summary: Issue #21882: In turtle demos, remove module scope gui and sys calls by either deleting or moving to the module's main function. files: Lib/turtle.py | 2 +- Lib/turtledemo/clock.py | 6 +- Lib/turtledemo/colormixer.py | 2 - Lib/turtledemo/demohelp.txt | 5 +- Lib/turtledemo/minimal_hanoi.py | 1 - Lib/turtledemo/nim.py | 10 +- Lib/turtledemo/two_canvases.py | 80 +++++++++----------- 7 files changed, 48 insertions(+), 58 deletions(-) diff --git a/Lib/turtle.py b/Lib/turtle.py --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -140,7 +140,7 @@ _tg_utilities = ['write_docstringdict', 'done'] __all__ = (_tg_classes + _tg_screen_functions + _tg_turtle_functions + - _tg_utilities) # + _math_functions) + _tg_utilities + ['Terminator']) # + _math_functions) _alias_list = ['addshape', 'backward', 'bk', 'fd', 'ht', 'lt', 'pd', 'pos', 'pu', 'rt', 'seth', 'setpos', 'setposition', 'st', diff --git a/Lib/turtledemo/clock.py b/Lib/turtledemo/clock.py --- a/Lib/turtledemo/clock.py +++ b/Lib/turtledemo/clock.py @@ -11,11 +11,8 @@ ------------------------------------ """ from turtle import * -from turtle import Terminator # not in __all__ from datetime import datetime -mode("logo") - def jump(distanz, winkel=0): penup() right(winkel) @@ -43,7 +40,6 @@ hand_form = get_poly() register_shape(name, hand_form) - def clockface(radius): reset() pensize(7) @@ -84,7 +80,6 @@ writer.pu() writer.bk(85) - def wochentag(t): wochentag = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"] @@ -131,6 +126,7 @@ return "EVENTLOOP" if __name__ == "__main__": + mode("logo") msg = main() print(msg) mainloop() diff --git a/Lib/turtledemo/colormixer.py b/Lib/turtledemo/colormixer.py --- a/Lib/turtledemo/colormixer.py +++ b/Lib/turtledemo/colormixer.py @@ -1,8 +1,6 @@ # colormixer from turtle import Screen, Turtle, mainloop -import sys -sys.setrecursionlimit(20000) # overcomes, for now, an instability of Python 3.0 class ColorTurtle(Turtle): diff --git a/Lib/turtledemo/demohelp.txt b/Lib/turtledemo/demohelp.txt --- a/Lib/turtledemo/demohelp.txt +++ b/Lib/turtledemo/demohelp.txt @@ -54,6 +54,9 @@ (2) How to add your own demos to the demo repository - Place the file in the same directory as turtledemo/__main__.py + IMPORTANT! When imported, the demo should not modify the system + by calling functions in other modules, such as sys, tkinter, or + turtle. Global variables should be initialized in main(). - The code must contain a main() function which will be executed by the viewer (see provided example scripts). @@ -65,7 +68,7 @@ if __name__ == '__main__': main() - mainloop() # keep window + mainloop() # keep window open python -m turtledemo.mydemo # will then run it diff --git a/Lib/turtledemo/minimal_hanoi.py b/Lib/turtledemo/minimal_hanoi.py --- a/Lib/turtledemo/minimal_hanoi.py +++ b/Lib/turtledemo/minimal_hanoi.py @@ -18,7 +18,6 @@ --------------------------------------- """ from turtle import * -from turtle import Terminator # not in __all__ class Disc(Turtle): def __init__(self, n): diff --git a/Lib/turtledemo/nim.py b/Lib/turtledemo/nim.py --- a/Lib/turtledemo/nim.py +++ b/Lib/turtledemo/nim.py @@ -143,7 +143,6 @@ self.writer.write(msg1, align="center", font=("Courier",14,"bold")) self.screen.tracer(True) - def setup(self): self.screen.tracer(False) for row in range(3): @@ -181,6 +180,7 @@ if self.game.state == Nim.OVER: self.screen.clear() + class NimController(object): def __init__(self, game): @@ -201,6 +201,7 @@ self.game.model.notify_move(row, col) self.BUSY = False + class Nim(object): CREATED = 0 RUNNING = 1 @@ -213,11 +214,10 @@ self.controller = NimController(self) -mainscreen = turtle.Screen() -mainscreen.mode("standard") -mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) - def main(): + mainscreen = turtle.Screen() + mainscreen.mode("standard") + mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) nim = Nim(mainscreen) return "EVENTLOOP!" diff --git a/Lib/turtledemo/two_canvases.py b/Lib/turtledemo/two_canvases.py --- a/Lib/turtledemo/two_canvases.py +++ b/Lib/turtledemo/two_canvases.py @@ -1,60 +1,54 @@ """turtledemo.two_canvases Use TurtleScreen and RawTurtle to draw on two -distinct canvases. +distinct canvases in a separate windows. The +new window must be separately closed in +addition to pressing the STOP button. """ -#The final mainloop only serves to keep the window open. - -#TODO: This runs in its own two-canvas window when selected in the -#demoviewer examples menu but the text is not loaded and the previous -#example is left visible. If the ending mainloop is removed, the text -#Eis loaded, this run again in a third window, and if start is pressed, -#demoviewer raises an error because main is not found, and then freezes. from turtle import TurtleScreen, RawTurtle, TK -root = TK.Tk() -cv1 = TK.Canvas(root, width=300, height=200, bg="#ddffff") -cv2 = TK.Canvas(root, width=300, height=200, bg="#ffeeee") -cv1.pack() -cv2.pack() +def main(): + root = TK.Tk() + cv1 = TK.Canvas(root, width=300, height=200, bg="#ddffff") + cv2 = TK.Canvas(root, width=300, height=200, bg="#ffeeee") + cv1.pack() + cv2.pack() -s1 = TurtleScreen(cv1) -s1.bgcolor(0.85, 0.85, 1) -s2 = TurtleScreen(cv2) -s2.bgcolor(1, 0.85, 0.85) + s1 = TurtleScreen(cv1) + s1.bgcolor(0.85, 0.85, 1) + s2 = TurtleScreen(cv2) + s2.bgcolor(1, 0.85, 0.85) -p = RawTurtle(s1) -q = RawTurtle(s2) + p = RawTurtle(s1) + q = RawTurtle(s2) -p.color("red", (1, 0.85, 0.85)) -p.width(3) -q.color("blue", (0.85, 0.85, 1)) -q.width(3) + p.color("red", (1, 0.85, 0.85)) + p.width(3) + q.color("blue", (0.85, 0.85, 1)) + q.width(3) -for t in p,q: - t.shape("turtle") - t.lt(36) + for t in p,q: + t.shape("turtle") + t.lt(36) -q.lt(180) + q.lt(180) -for t in p, q: - t.begin_fill() -for i in range(5): for t in p, q: - t.fd(50) - t.lt(72) -for t in p,q: - t.end_fill() - t.lt(54) - t.pu() - t.bk(50) + t.begin_fill() + for i in range(5): + for t in p, q: + t.fd(50) + t.lt(72) + for t in p,q: + t.end_fill() + t.lt(54) + t.pu() + t.bk(50) -## Want to get some info? + return "EVENTLOOP" -#print(s1, s2) -#print(p, q) -#print(s1.turtles()) -#print(s2.turtles()) -TK.mainloop() +if __name__ == '__main__': + main() + TK.mainloop() # keep window open until user closes it -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #21882: In turtle demos, remove module scope gui and sys calls by
by terry.reedy June 30, 2014

June 30, 2014

http://hg.python.org/cpython/rev/c173a34f20c0 changeset: 91487:c173a34f20c0 branch: 2.7 parent: 91477:53112afddae6 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Mon Jun 30 16:09:16 2014 -0400 summary: Issue #21882: In turtle demos, remove module scope gui and sys calls by moving them to the module's main function. files: Demo/turtle/demohelp.txt | 3 + Demo/turtle/tdemo_clock.py | 8 +- Demo/turtle/tdemo_minimal_hanoi.py | 1 - Demo/turtle/tdemo_nim.py | 27 +++--- Demo/turtle/tdemo_two_canvases.py | 54 ++++++++++++++ Demo/turtle/turtledemo_two_canvases.py | 49 ------------ Lib/lib-tk/turtle.py | 2 +- 7 files changed, 73 insertions(+), 71 deletions(-) diff --git a/Demo/turtle/demohelp.txt b/Demo/turtle/demohelp.txt --- a/Demo/turtle/demohelp.txt +++ b/Demo/turtle/demohelp.txt @@ -52,6 +52,9 @@ (2) How to add your own demos to the demo repository + IMPORTANT! When imported, the demo should not modify the system + by calling functions in other modules, such as sys, tkinter, or + turtle. Global variables should be initialized in main(). - The script name must begin with tdemo_ , so it must have the form tdemo_<your-script-name>.py diff --git a/Demo/turtle/tdemo_clock.py b/Demo/turtle/tdemo_clock.py --- a/Demo/turtle/tdemo_clock.py +++ b/Demo/turtle/tdemo_clock.py @@ -11,11 +11,8 @@ ------------------------------------ """ from turtle import * -from turtle import Terminator # not in __all__ from datetime import datetime -mode("logo") - def jump(distanz, winkel=0): penup() right(winkel) @@ -43,7 +40,6 @@ hand_form = get_poly() register_shape(name, hand_form) - def clockface(radius): reset() pensize(7) @@ -84,7 +80,6 @@ writer.pu() writer.bk(85) - def wochentag(t): wochentag = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"] @@ -131,6 +126,7 @@ return "EVENTLOOP" if __name__ == "__main__": + mode("logo") msg = main() print msg - mainloop() + mainloop() # keep window open diff --git a/Demo/turtle/tdemo_minimal_hanoi.py b/Demo/turtle/tdemo_minimal_hanoi.py --- a/Demo/turtle/tdemo_minimal_hanoi.py +++ b/Demo/turtle/tdemo_minimal_hanoi.py @@ -18,7 +18,6 @@ --------------------------------------- """ from turtle import * -from turtle import Terminator # not in __all__ class Disc(Turtle): def __init__(self, n): diff --git a/Demo/turtle/tdemo_nim.py b/Demo/turtle/tdemo_nim.py --- a/Demo/turtle/tdemo_nim.py +++ b/Demo/turtle/tdemo_nim.py @@ -1,7 +1,7 @@ """ turtle-example-suite: tdemo_nim.py - + Play nim against the computer. The player who takes the last stick is the winner. @@ -41,7 +41,7 @@ return move def randommove(state): - m = max(state) + m = max(state) while True: z = random.randint(0,2) if state[z] > (m > 1): @@ -62,7 +62,7 @@ self.winner = None self.game.view.setup() self.game.state = Nim.RUNNING - + def move(self, row, col): maxspalte = self.sticks[row] self.sticks[row] = col @@ -76,7 +76,7 @@ row, col = computerzug(self.sticks) self.move(row, col) self.player = 0 - + def game_over(self): return self.sticks == [0, 0, 0] @@ -100,13 +100,13 @@ self.goto(x,y) self.color("white") self.showturtle() - + def coords(self, row, col): packet, remainder = divmod(col, 5) x = (3 + 11 * packet + 2 * remainder) * WUNIT y = (2 + 3 * row) * HUNIT return x - SCREENWIDTH // 2 + WUNIT // 2, SCREENHEIGHT // 2 - y - HUNIT // 2 - + def makemove(self, x, y): if self.game.state != Nim.RUNNING: return @@ -142,7 +142,7 @@ self.writer.pencolor("black") self.writer.write(msg1, align="center", font=("Courier",14,"bold")) self.screen.tracer(True) - + def setup(self): self.screen.tracer(False) @@ -181,6 +181,7 @@ if self.game.state == Nim.OVER: self.screen.clear() + class NimController(object): def __init__(self, game): @@ -200,28 +201,26 @@ self.BUSY = True self.game.model.notify_move(row, col) self.BUSY = False - + class Nim(object): CREATED = 0 RUNNING = 1 OVER = 2 def __init__(self, screen): - self.state = Nim.CREATED + self.state = Nim.CREATED self.screen = screen self.model = NimModel(self) self.view = NimView(self) self.controller = NimController(self) - -mainscreen = turtle.Screen() -mainscreen.mode("standard") -mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) def main(): + mainscreen = turtle.Screen() + mainscreen.mode("standard") + mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) nim = Nim(mainscreen) return "EVENTLOOP!" if __name__ == "__main__": main() turtle.mainloop() - diff --git a/Demo/turtle/tdemo_two_canvases.py b/Demo/turtle/tdemo_two_canvases.py new file mode 100644 --- /dev/null +++ b/Demo/turtle/tdemo_two_canvases.py @@ -0,0 +1,54 @@ +"""turtledemo.two_canvases + +Use TurtleScreen and RawTurtle to draw on two +distinct canvases in a separate windows. The +new window must be separately closed in +addition to pressing the STOP button. +""" + +from turtle import TurtleScreen, RawTurtle, TK + +def main(): + root = TK.Tk() + cv1 = TK.Canvas(root, width=300, height=200, bg="#ddffff") + cv2 = TK.Canvas(root, width=300, height=200, bg="#ffeeee") + cv1.pack() + cv2.pack() + + s1 = TurtleScreen(cv1) + s1.bgcolor(0.85, 0.85, 1) + s2 = TurtleScreen(cv2) + s2.bgcolor(1, 0.85, 0.85) + + p = RawTurtle(s1) + q = RawTurtle(s2) + + p.color("red", (1, 0.85, 0.85)) + p.width(3) + q.color("blue", (0.85, 0.85, 1)) + q.width(3) + + for t in p,q: + t.shape("turtle") + t.lt(36) + + q.lt(180) + + for t in p, q: + t.begin_fill() + for i in range(5): + for t in p, q: + t.fd(50) + t.lt(72) + for t in p,q: + t.end_fill() + t.lt(54) + t.pu() + t.bk(50) + + return "EVENTLOOP" + + +if __name__ == '__main__': + main() + TK.mainloop() # keep window open until user closes it diff --git a/Demo/turtle/turtledemo_two_canvases.py b/Demo/turtle/turtledemo_two_canvases.py deleted file mode 100755 --- a/Demo/turtle/turtledemo_two_canvases.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env python -## DEMONSTRATES USE OF 2 CANVASES, SO CANNOT BE RUN IN DEMOVIEWER! -"""turtle example: Using TurtleScreen and RawTurtle -for drawing on two distinct canvases. -""" -from turtle import TurtleScreen, RawTurtle, TK - -root = TK.Tk() -cv1 = TK.Canvas(root, width=300, height=200, bg="#ddffff") -cv2 = TK.Canvas(root, width=300, height=200, bg="#ffeeee") -cv1.pack() -cv2.pack() - -s1 = TurtleScreen(cv1) -s1.bgcolor(0.85, 0.85, 1) -s2 = TurtleScreen(cv2) -s2.bgcolor(1, 0.85, 0.85) - -p = RawTurtle(s1) -q = RawTurtle(s2) - -p.color("red", "white") -p.width(3) -q.color("blue", "black") -q.width(3) - -for t in p,q: - t.shape("turtle") - t.lt(36) - -q.lt(180) - -for i in range(5): - for t in p, q: - t.fd(50) - t.lt(72) -for t in p,q: - t.lt(54) - t.pu() - t.bk(50) - -## Want to get some info? - -print s1, s2 -print p, q -print s1.turtles() -print s2.turtles() - -TK.mainloop() 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 @@ -142,7 +142,7 @@ 'log10', 'modf', 'pi', 'pow', 'sin', 'sinh', 'sqrt', 'tan', 'tanh'] __all__ = (_tg_classes + _tg_screen_functions + _tg_turtle_functions + - _tg_utilities + _math_functions) + _tg_utilities + ['Terminator'] + _math_functions) _alias_list = ['addshape', 'backward', 'bk', 'fd', 'ht', 'lt', 'pd', 'pos', 'pu', 'rt', 'seth', 'setpos', 'setposition', 'st', -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): (Merge 3.4) Issue #21163: BaseEventLoop.run_until_complete() and
by victor.stinner June 30, 2014

June 30, 2014

http://hg.python.org/cpython/rev/2d0fa8f383c8 changeset: 91486:2d0fa8f383c8 parent: 91484:8dc8c93e74c9 parent: 91485:13e78b9cf290 user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Jun 30 14:51:24 2014 +0200 summary: (Merge 3.4) Issue #21163: BaseEventLoop.run_until_complete() and test_utils.run_briefly() don't log the "destroy pending task" message anymore. The log is redundant for run_until_complete() and useless in run_briefly(). files: Lib/asyncio/base_events.py | 7 +++++++ Lib/asyncio/tasks.py | 5 ++++- Lib/asyncio/test_utils.py | 3 +++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -227,7 +227,14 @@ Return the Future's result, or raise its exception. """ self._check_closed() + + new_task = not isinstance(future, futures.Future) future = tasks.async(future, loop=self) + if new_task: + # An exception is raised if the future didn't complete, so there + # is no need to log the "destroy pending task" message + future._log_destroy_pending = False + future.add_done_callback(_raise_stop_error) self.run_forever() future.remove_done_callback(_raise_stop_error) diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -75,13 +75,16 @@ self._must_cancel = False self._loop.call_soon(self._step) self.__class__._all_tasks.add(self) + # If False, don't log a message if the task is destroyed whereas its + # status is still pending + self._log_destroy_pending = True # On Python 3.3 or older, objects with a destructor part of a reference # cycle are never destroyed. It's not more the case on Python 3.4 thanks to # the PEP 442. if _PY34: def __del__(self): - if self._state == futures._PENDING: + if self._state == futures._PENDING and self._log_destroy_pending: context = { 'task': self, 'message': 'Task was destroyed but it is pending!', diff --git a/Lib/asyncio/test_utils.py b/Lib/asyncio/test_utils.py --- a/Lib/asyncio/test_utils.py +++ b/Lib/asyncio/test_utils.py @@ -49,6 +49,9 @@ pass gen = once() t = tasks.Task(gen, loop=loop) + # Don't log a warning if the task is not done after run_until_complete(). + # It occurs if the loop is stopped or if a task raises a BaseException. + t._log_destroy_pending = False try: loop.run_until_complete(t) finally: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Issue #21163: BaseEventLoop.run_until_complete() and test_utils.run_briefly()
by victor.stinner June 30, 2014

June 30, 2014

http://hg.python.org/cpython/rev/13e78b9cf290 changeset: 91485:13e78b9cf290 branch: 3.4 parent: 91483:defd09a5339a user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Jun 30 14:51:04 2014 +0200 summary: Issue #21163: BaseEventLoop.run_until_complete() and test_utils.run_briefly() don't log the "destroy pending task" message anymore. The log is redundant for run_until_complete() and useless in run_briefly(). files: Lib/asyncio/base_events.py | 7 +++++++ Lib/asyncio/tasks.py | 5 ++++- Lib/asyncio/test_utils.py | 3 +++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -227,7 +227,14 @@ Return the Future's result, or raise its exception. """ self._check_closed() + + new_task = not isinstance(future, futures.Future) future = tasks.async(future, loop=self) + if new_task: + # An exception is raised if the future didn't complete, so there + # is no need to log the "destroy pending task" message + future._log_destroy_pending = False + future.add_done_callback(_raise_stop_error) self.run_forever() future.remove_done_callback(_raise_stop_error) diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -75,13 +75,16 @@ self._must_cancel = False self._loop.call_soon(self._step) self.__class__._all_tasks.add(self) + # If False, don't log a message if the task is destroyed whereas its + # status is still pending + self._log_destroy_pending = True # On Python 3.3 or older, objects with a destructor part of a reference # cycle are never destroyed. It's not more the case on Python 3.4 thanks to # the PEP 442. if _PY34: def __del__(self): - if self._state == futures._PENDING: + if self._state == futures._PENDING and self._log_destroy_pending: context = { 'task': self, 'message': 'Task was destroyed but it is pending!', diff --git a/Lib/asyncio/test_utils.py b/Lib/asyncio/test_utils.py --- a/Lib/asyncio/test_utils.py +++ b/Lib/asyncio/test_utils.py @@ -49,6 +49,9 @@ pass gen = once() t = tasks.Task(gen, loop=loop) + # Don't log a warning if the task is not done after run_until_complete(). + # It occurs if the loop is stopped or if a task raises a BaseException. + t._log_destroy_pending = False try: loop.run_until_complete(t) finally: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): asyncio: sync with Tulip
by victor.stinner June 30, 2014

June 30, 2014

http://hg.python.org/cpython/rev/8dc8c93e74c9 changeset: 91484:8dc8c93e74c9 parent: 91482:69d474dab479 parent: 91483:defd09a5339a user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Jun 30 14:39:47 2014 +0200 summary: asyncio: sync with Tulip - Sort imports - Simplify/optimize iscoroutine(). Inline inspect.isgenerator(obj): replace it with isinstance(obj, types.GeneratorType) - CoroWrapper: check at runtime if Python has the yield-from bug #21209. If Python has the bug, check if CoroWrapper.send() was called by yield-from to decide if parameters must be unpacked or not. - Fix "Task was destroyed but it is pending!" warning in test_task_source_traceback() files: Lib/asyncio/base_events.py | 4 +- Lib/asyncio/coroutines.py | 57 ++++++++++++++-- Lib/test/test_asyncio/test_tasks.py | 1 + 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -19,11 +19,11 @@ import heapq import inspect import logging +import os import socket import subprocess +import time import traceback -import time -import os import sys from . import coroutines diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py --- a/Lib/asyncio/coroutines.py +++ b/Lib/asyncio/coroutines.py @@ -3,14 +3,20 @@ import functools import inspect +import opcode import os import sys import traceback +import types from . import events from . import futures from .log import logger + +# Opcode of "yield from" instruction +_YIELD_FROM = opcode.opmap['YIELD_FROM'] + # If you set _DEBUG to true, @coroutine will wrap the resulting # generator objects in a CoroWrapper instance (defined below). That # instance will log a message when the generator is never iterated @@ -25,6 +31,31 @@ _PY35 = (sys.version_info >= (3, 5)) + +# Check for CPython issue #21209 +def has_yield_from_bug(): + class MyGen: + def __init__(self): + self.send_args = None + def __iter__(self): + return self + def __next__(self): + return 42 + def send(self, *what): + self.send_args = what + return None + def yield_from_gen(gen): + yield from gen + value = (1, 2, 3) + gen = MyGen() + coro = yield_from_gen(gen) + next(coro) + coro.send(value) + return gen.send_args != (value,) +_YIELD_FROM_BUG = has_yield_from_bug() +del has_yield_from_bug + + class CoroWrapper: # Wrapper for coroutine in _DEBUG mode. @@ -40,13 +71,21 @@ def __next__(self): return next(self.gen) - def send(self, *value): - # We use `*value` because of a bug in CPythons prior - # to 3.4.1. See issue #21209 and test_yield_from_corowrapper - # for details. This workaround should be removed in 3.5.0. - if len(value) == 1: - value = value[0] - return self.gen.send(value) + if _YIELD_FROM_BUG: + # For for CPython issue #21209: using "yield from" and a custom + # generator, generator.send(tuple) unpacks the tuple instead of passing + # the tuple unchanged. Check if the caller is a generator using "yield + # from" to decide if the parameter should be unpacked or not. + def send(self, *value): + frame = sys._getframe() + caller = frame.f_back + assert caller.f_lasti >= 0 + if caller.f_code.co_code[caller.f_lasti] != _YIELD_FROM: + value = value[0] + return self.gen.send(value) + else: + def send(self, value): + return self.gen.send(value) def throw(self, exc): return self.gen.throw(exc) @@ -119,9 +158,11 @@ return getattr(func, '_is_coroutine', False) +_COROUTINE_TYPES = (CoroWrapper, types.GeneratorType) + def iscoroutine(obj): """Return True if obj is a coroutine object.""" - return isinstance(obj, CoroWrapper) or inspect.isgenerator(obj) + return isinstance(obj, _COROUTINE_TYPES) def _format_coroutine(coro): diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -1621,6 +1621,7 @@ (__file__, lineno, 'test_task_source_traceback')) + self.loop.run_until_complete(task) class GatherTestsBase: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): asyncio: sync with Tulip
by victor.stinner June 30, 2014

June 30, 2014

http://hg.python.org/cpython/rev/defd09a5339a changeset: 91483:defd09a5339a branch: 3.4 parent: 91480:4c8fc852244a user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Jun 30 14:39:11 2014 +0200 summary: asyncio: sync with Tulip - Sort imports - Simplify/optimize iscoroutine(). Inline inspect.isgenerator(obj): replace it with isinstance(obj, types.GeneratorType) - CoroWrapper: check at runtime if Python has the yield-from bug #21209. If Python has the bug, check if CoroWrapper.send() was called by yield-from to decide if parameters must be unpacked or not. - Fix "Task was destroyed but it is pending!" warning in test_task_source_traceback() files: Lib/asyncio/base_events.py | 4 +- Lib/asyncio/coroutines.py | 57 ++++++++++++++-- Lib/test/test_asyncio/test_tasks.py | 1 + 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -19,11 +19,11 @@ import heapq import inspect import logging +import os import socket import subprocess +import time import traceback -import time -import os import sys from . import coroutines diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py --- a/Lib/asyncio/coroutines.py +++ b/Lib/asyncio/coroutines.py @@ -3,14 +3,20 @@ import functools import inspect +import opcode import os import sys import traceback +import types from . import events from . import futures from .log import logger + +# Opcode of "yield from" instruction +_YIELD_FROM = opcode.opmap['YIELD_FROM'] + # If you set _DEBUG to true, @coroutine will wrap the resulting # generator objects in a CoroWrapper instance (defined below). That # instance will log a message when the generator is never iterated @@ -25,6 +31,31 @@ _PY35 = (sys.version_info >= (3, 5)) + +# Check for CPython issue #21209 +def has_yield_from_bug(): + class MyGen: + def __init__(self): + self.send_args = None + def __iter__(self): + return self + def __next__(self): + return 42 + def send(self, *what): + self.send_args = what + return None + def yield_from_gen(gen): + yield from gen + value = (1, 2, 3) + gen = MyGen() + coro = yield_from_gen(gen) + next(coro) + coro.send(value) + return gen.send_args != (value,) +_YIELD_FROM_BUG = has_yield_from_bug() +del has_yield_from_bug + + class CoroWrapper: # Wrapper for coroutine in _DEBUG mode. @@ -40,13 +71,21 @@ def __next__(self): return next(self.gen) - def send(self, *value): - # We use `*value` because of a bug in CPythons prior - # to 3.4.1. See issue #21209 and test_yield_from_corowrapper - # for details. This workaround should be removed in 3.5.0. - if len(value) == 1: - value = value[0] - return self.gen.send(value) + if _YIELD_FROM_BUG: + # For for CPython issue #21209: using "yield from" and a custom + # generator, generator.send(tuple) unpacks the tuple instead of passing + # the tuple unchanged. Check if the caller is a generator using "yield + # from" to decide if the parameter should be unpacked or not. + def send(self, *value): + frame = sys._getframe() + caller = frame.f_back + assert caller.f_lasti >= 0 + if caller.f_code.co_code[caller.f_lasti] != _YIELD_FROM: + value = value[0] + return self.gen.send(value) + else: + def send(self, value): + return self.gen.send(value) def throw(self, exc): return self.gen.throw(exc) @@ -119,9 +158,11 @@ return getattr(func, '_is_coroutine', False) +_COROUTINE_TYPES = (CoroWrapper, types.GeneratorType) + def iscoroutine(obj): """Return True if obj is a coroutine object.""" - return isinstance(obj, CoroWrapper) or inspect.isgenerator(obj) + return isinstance(obj, _COROUTINE_TYPES) def _format_coroutine(coro): diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -1621,6 +1621,7 @@ (__file__, lineno, 'test_task_source_traceback')) + self.loop.run_until_complete(task) class GatherTestsBase: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #21645: asyncio: add a watchdog in test_read_all_from_pipe_reader() for
by victor.stinner June 30, 2014

June 30, 2014

http://hg.python.org/cpython/rev/69d474dab479 changeset: 91482:69d474dab479 user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Jun 30 12:32:59 2014 +0200 summary: Issue #21645: asyncio: add a watchdog in test_read_all_from_pipe_reader() for debug files: Lib/test/test_asyncio/test_streams.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -596,6 +596,12 @@ code = """\ import os, sys +try: + import faulthandler +except ImportError: + pass +else: + faulthandler.dump_traceback_later(60, exit=True) fd = int(sys.argv[1]) os.write(fd, b'data') os.close(fd) -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (10a1e7780ee7): sum=11
by solipsis＠pitrou.net June 30, 2014

June 30, 2014

results for 10a1e7780ee7 on branch "default" -------------------------------------------- test_collections leaked [0, 2, 0] references, sum=2 test_functools leaked [0, 0, 3] memory blocks, sum=3 test_io leaked [2, 2, 2] references, sum=6 test_site leaked [0, 2, -2] references, sum=0 test_site leaked [0, 2, -2] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogW8rsIQ', '-x']

1 0

cpython (merge 3.4 -> default): Fix typo in socket.getaddrinfo() docstring.
by berker.peksag June 30, 2014

June 30, 2014

http://hg.python.org/cpython/rev/3086709101ff changeset: 91481:3086709101ff parent: 91479:1f59baf609a4 parent: 91480:4c8fc852244a user: Berker Peksag <berker.peksag(a)gmail.com> date: Mon Jun 30 11:30:00 2014 +0300 summary: Fix typo in socket.getaddrinfo() docstring. Reported by Krishna Kumar Thakur on docs@. files: Modules/socketmodule.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -33,8 +33,8 @@ - socket.ntohl(32 bit value) --> new int object - socket.htons(16 bit value) --> new int object - socket.htonl(32 bit value) --> new int object -- socket.getaddrinfo(host, port [, family, socktype, proto, flags]) - --> List of (family, socktype, proto, canonname, sockaddr) +- socket.getaddrinfo(host, port [, family, type, proto, flags]) + --> List of (family, type, proto, canonname, sockaddr) - socket.getnameinfo(sockaddr, flags) --> (host, port) - socket.AF_INET, socket.SOCK_STREAM, etc.: constants from <socket.h> - socket.has_ipv6: boolean value indicating if IPv6 is supported @@ -5290,8 +5290,8 @@ } PyDoc_STRVAR(getaddrinfo_doc, -"getaddrinfo(host, port [, family, socktype, proto, flags])\n\ - -> list of (family, socktype, proto, canonname, sockaddr)\n\ +"getaddrinfo(host, port [, family, type, proto, flags])\n\ + -> list of (family, type, proto, canonname, sockaddr)\n\ \n\ Resolve host and port into addrinfo struct."); -- Repository URL: http://hg.python.org/cpython

1 0