Author: Armin Rigo <[email protected]>
Branch: 
Changeset: r56893:ffd617dc699b
Date: 2012-08-27 22:19 +0200
http://bitbucket.org/pypy/pypy/changeset/ffd617dc699b/

Log:    The original deindent() function returns a Source instead of a
        string, and some places are relying on this. Fix.

diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -24,7 +24,9 @@
     """monkeypatch that wont end up doing stupid in the python tokenizer"""
     text = '\n'.join(self.lines)
     short = py.std.textwrap.dedent(text)
-    return short.splitlines()
+    newsource = py.code.Source()
+    newsource.lines[:] = short.splitlines()
+    return newsource
 
 py.code.Source.deindent = braindead_deindent
 
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to