Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r84433:aa1a6a3e01e0
Date: 2016-05-14 11:19 -0700
http://bitbucket.org/pypy/pypy/changeset/aa1a6a3e01e0/
Log: merge default
diff --git a/lib-python/2.7/test/test_sys_settrace.py
b/lib-python/2.7/test/test_sys_settrace.py
--- a/lib-python/2.7/test/test_sys_settrace.py
+++ b/lib-python/2.7/test/test_sys_settrace.py
@@ -328,8 +328,8 @@
def test_13_genexp(self):
if self.using_gc:
+ gc.enable()
test_support.gc_collect()
- gc.enable()
try:
self.run_test(generator_example)
# issue1265: if the trace function contains a generator,
diff --git a/rpython/memory/gc/env.py b/rpython/memory/gc/env.py
--- a/rpython/memory/gc/env.py
+++ b/rpython/memory/gc/env.py
@@ -230,7 +230,6 @@
data = ''.join(data)
linepos = 0
while True:
- print linepos
start = _findend(data, '\n' + label, linepos)
if start < 0:
break # done
@@ -242,11 +241,11 @@
break
linepos = end
size = data[start:end]
- if size[len(size)-1] not in ('K', 'k'): # assume kilobytes for
now
+ last_char = len(size)-1
+ assert 0 <= last_char < len(size)
+ if size[last_char] not in ('K', 'k'): # assume kilobytes for now
continue
- last = len(size) - 1
- assert last >= 0
- number = int(size[:last]) * 1024
+ number = int(size[:last_char])* 1024
# for now we look for the smallest of the L2 caches of the CPUs
if number < L2cache:
L2cache = number
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
