diff --git a/kallithea/tests/models/test_diff_parsers.py b/kallithea/tests/models/test_diff_parsers.py --- a/kallithea/tests/models/test_diff_parsers.py +++ b/kallithea/tests/models/test_diff_parsers.py @@ -292,23 +292,24 @@ class TestDiffLib(TestController): #from pprint import pprint; pprint(chunks[1]) l = ['\n'] for d in chunks[1]: + d['line'] = d['line'].encode() # not needed for py3 l.append('%(action)-7s %(new_lineno)3s %(old_lineno)3s %(line)r\n' % d) s = ''.join(l) assert s == r''' -context ... ... u'@@ -51,6 +51,13 @@\n' -unmod 51 51 u'\tbegin();\n' -unmod 52 52 u'\t\n' -add 53 u'\tint foo;\n' -add 54 u'\tint bar; \n' -add 55 u'\tint baz;\t\n' -add 56 u'\tint space; ' -add 57 u'\tint tab;\t\n' -add 58 u'\t\n' -unmod 59 53 u' ' -del 54 u'\t#define MAX_STEPS (48)\n' -add 60 u'\t\n' -add 61 u'\t#define MAX_STEPS (64)\n' -unmod 62 55 u'\n' -del 56 u'\t#define MIN_STEPS (48)\n' -add 63 u'\t#define MIN_STEPS (42)\n' +context ... ... '@@ -51,6 +51,13 @@\n' +unmod 51 51 '\tbegin();\n' +unmod 52 52 '\t\n' +add 53 '\tint foo;\n' +add 54 '\tint bar; \n' +add 55 '\tint baz;\t\n' +add 56 '\tint space; ' +add 57 '\tint tab;\t\n' +add 58 '\t\n' +unmod 59 53 ' ' +del 54 '\t#define MAX_STEPS (48)\n' +add 60 '\t\n' +add 61 '\t#define MAX_STEPS (64)\n' +unmod 62 55 '\n' +del 56 '\t#define MIN_STEPS (48)\n' +add 63 '\t#define MIN_STEPS (42)\n' '''