[Python-checkins] cpython (merge 3.4 -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/3426d25a00a2
changeset:   91316:3426d25a00a2
parent:      91313:3f4abe3107ce
parent:      91315:39b094798e14
user:        Raymond Hettinger <python at rcn.com>
date:        Sun Jun 22 01:23:55 2014 -0700
summary:
  merge

files:
  Lib/turtle.py |  2 +-
  Misc/ACKS     |  1 +
  2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/turtle.py b/Lib/turtle.py
--- a/Lib/turtle.py
+++ b/Lib/turtle.py
@@ -2945,7 +2945,7 @@
         self._stretchfactor = a11, a22
         self._shearfactor = a12/a22
         self._tilt = alfa
-        self._update()
+        self.pen(resizemode="user")
 
 
     def _polytrafo(self, poly):
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -236,6 +236,7 @@
 Albert Chin-A-Young
 Adal Chiriliuc
 Matt Chisholm
+Lita Cho
 Anders Chrigström
 Tom Christiansen
 Vadim Chugunov

-- 
Repository URL: http://hg.python.org/cpython