Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r75608:b4619d9ff598
Date: 2015-01-31 14:43 +0100
http://bitbucket.org/pypy/pypy/changeset/b4619d9ff598/
Log: Use pypystm.stmset() instead of stmidset (which should probably be
removed soon). Also, "try:" instead of crash.
diff --git a/rpython/annotator/annrpython.py b/rpython/annotator/annrpython.py
--- a/rpython/annotator/annrpython.py
+++ b/rpython/annotator/annrpython.py
@@ -17,7 +17,10 @@
log = py.log.Producer("annrpython")
py.log.setconsumer("annrpython", ansi_log)
-from transaction import stmidset
+try:
+ from pypystm import stmset
+except ImportError:
+ stmset = set
class RPythonAnnotator(object):
@@ -38,7 +41,7 @@
self.added_blocks = None # see processblock() below
self.links_followed = {} # set of links that have ever been followed
self.notify = {} # {block: {positions-to-reflow-from-when-done}}
- self.fixed_graphs = stmidset() # set of graphs not to annotate again
+ self.fixed_graphs = stmset() # set of graphs not to annotate again
self.blocked_blocks = {} # set of {blocked_block: (graph, index)}
# --- the following information is recorded for debugging ---
self.blocked_graphs = {} # set of graphs that have blocked blocks
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
