Author: mattip <[email protected]>
Branch:
Changeset: r59998:794896284f78
Date: 2013-01-12 21:40 +0200
http://bitbucket.org/pypy/pypy/changeset/794896284f78/
Log: backout half of previous uncareful commit
diff --git a/lib-python/2.7/heapq.py b/lib-python/2.7/heapq.py
--- a/lib-python/2.7/heapq.py
+++ b/lib-python/2.7/heapq.py
@@ -129,11 +129,7 @@
__all__ = ['heappush', 'heappop', 'heapify', 'heapreplace', 'merge',
'nlargest', 'nsmallest', 'heappushpop']
-try:
- from itertools import islice, repeat, count, imap, izip, tee, chain
-except:
- import sys
- print sys.path
+from itertools import islice, repeat, count, imap, izip, tee, chain
from operator import itemgetter
import bisect
diff --git a/lib-python/2.7/test/test_signal.py
b/lib-python/2.7/test/test_signal.py
--- a/lib-python/2.7/test/test_signal.py
+++ b/lib-python/2.7/test/test_signal.py
@@ -224,8 +224,7 @@
signal.signal(-1, handler)
with self.assertRaises(ValueError):
- pass
- #signal.signal(7, handler)
+ signal.signal(7, handler)
print 'ok'
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
