equal
deleted
inserted
replaced
109 raise |
109 raise |
110 else: |
110 else: |
111 def blocks(sa, sb): |
111 def blocks(sa, sb): |
112 a = ffi.new("struct bdiff_line**") |
112 a = ffi.new("struct bdiff_line**") |
113 b = ffi.new("struct bdiff_line**") |
113 b = ffi.new("struct bdiff_line**") |
114 ac = ffi.new("char[]", sa) |
114 ac = ffi.new("char[]", str(sa)) |
115 bc = ffi.new("char[]", sb) |
115 bc = ffi.new("char[]", str(sb)) |
116 l = ffi.new("struct bdiff_hunk*") |
116 l = ffi.new("struct bdiff_hunk*") |
117 try: |
117 try: |
118 an = lib.bdiff_splitlines(ac, len(sa), a) |
118 an = lib.bdiff_splitlines(ac, len(sa), a) |
119 bn = lib.bdiff_splitlines(bc, len(sb), b) |
119 bn = lib.bdiff_splitlines(bc, len(sb), b) |
120 if not a[0] or not b[0]: |
120 if not a[0] or not b[0]: |
136 return rl |
136 return rl |
137 |
137 |
138 def bdiff(sa, sb): |
138 def bdiff(sa, sb): |
139 a = ffi.new("struct bdiff_line**") |
139 a = ffi.new("struct bdiff_line**") |
140 b = ffi.new("struct bdiff_line**") |
140 b = ffi.new("struct bdiff_line**") |
141 ac = ffi.new("char[]", sa) |
141 ac = ffi.new("char[]", str(sa)) |
142 bc = ffi.new("char[]", sb) |
142 bc = ffi.new("char[]", str(sb)) |
143 l = ffi.new("struct bdiff_hunk*") |
143 l = ffi.new("struct bdiff_hunk*") |
144 try: |
144 try: |
145 an = lib.bdiff_splitlines(ac, len(sa), a) |
145 an = lib.bdiff_splitlines(ac, len(sa), a) |
146 bn = lib.bdiff_splitlines(bc, len(sb), b) |
146 bn = lib.bdiff_splitlines(bc, len(sb), b) |
147 if not a[0] or not b[0]: |
147 if not a[0] or not b[0]: |