[pypy-commit] pypy stmgc-c7: Change the "..." marker into "<" or ">", which are more distinctive in filenames

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r71259:5f88689ad670
Date: 2014-05-04 18:16 +0200
http://bitbucket.org/pypy/pypy/changeset/5f88689ad670/

Log:    Change the "..." marker into "<" or ">", which are more distinctive
        in filenames

diff --git a/lib_pypy/atomic.py b/lib_pypy/atomic.py
--- a/lib_pypy/atomic.py
+++ b/lib_pypy/atomic.py
@@ -61,9 +61,9 @@
                 if match and match.group(1) != '?':
                     filename = match.group(1)
                     lineno = int(match.group(2))
-                    if filename.startswith('...'):
+                    if filename.startswith('<') and not filename.endswith('>'):
                         if filename not in _fullfilenames:
-                            partial = filename[3:]
+                            partial = filename[1:]
                             found = set()
                             for module in sys.modules.values():
                                 try:
diff --git a/rpython/translator/stm/src_stm/extracode.h 
b/rpython/translator/stm/src_stm/extracode.h
--- a/rpython/translator/stm/src_stm/extracode.h
+++ b/rpython/translator/stm/src_stm/extracode.h
@@ -98,7 +98,7 @@
         name = _RPyString_AsString(co_name);
         if (nlen > remaining / 2) {
             nlen = remaining / 2;
-            ntrunc = "...";
+            ntrunc = "<";
         }
         remaining -= nlen;
 
@@ -107,7 +107,7 @@
         if (fnlen > remaining) {
             fn += (fnlen - remaining);
             fnlen = remaining;
-            fntrunc = "...";
+            fntrunc = ">";
         }
 
         long lnotablen = RPyString_Size(co_lnotab);
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit