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

[terry.reedy]

http://hg.python.org/cpython/rev/5bab20c27089
changeset:   92206:5bab20c27089
parent:      92159:d4fed3487792
parent:      92205:8b8b79e1f862
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Aug 19 19:47:51 2014 -0400
summary:
  Merge with 3.4

files:
  Lib/idlelib/ColorDelegator.py |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Lib/idlelib/ColorDelegator.py b/Lib/idlelib/ColorDelegator.py
--- a/Lib/idlelib/ColorDelegator.py
+++ b/Lib/idlelib/ColorDelegator.py
@@ -39,7 +39,6 @@
         Delegator.__init__(self)
         self.prog = prog
         self.idprog = idprog
-        self.asprog = asprog
         self.LoadTagDefs()
 
     def setdelegate(self, delegate):

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