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

Fri Oct 30 19:26:24 EDT 2015

https://hg.python.org/cpython/rev/e36da7323f8f
changeset: 98904:e36da7323f8f
parent: 98900:3f924cb4c3eb
parent: 98903:2d32429454ca
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Fri Oct 30 19:26:03 2015 -0400
summary:
 Merge with 3.5
files:
 Tools/scripts/fixdiv.py | 2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/Tools/scripts/fixdiv.py b/Tools/scripts/fixdiv.py
--- a/Tools/scripts/fixdiv.py
+++ b/Tools/scripts/fixdiv.py
@@ -335,8 +335,6 @@
 self.buffer.append(line)
 self.lineno += 1
 return line
- def truncate(self):
- del self.buffer[-window:]
 def __getitem__(self, index):
 self.fill()
 bufstart = self.lineno - len(self.buffer)
-- 
Repository URL: https://hg.python.org/cpython
