HelloZeroNet/ZeroNet
1
0
Fork 0
mirror of https://github.com/HelloZeroNet/ZeroNet.git synced 2023-12-14 04:33:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix diffing

Browse source
This commit is contained in:
shortcutme 2019-04-18 12:21:59 +02:00
parent b114c52c0d
commit 8edbecce3c
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/util/Diff.py
View file

@ -33,6 +33,8 @@ def diff(old, new, limit=False):
def patch(old_f, actions): def patch(old_f, actions):
new_f = io.BytesIO() new_f = io.BytesIO()
for action, param in actions: for action, param in actions:
if type(action) is bytes:
action = action.decode()
if action == "=": # Same lines if action == "=": # Same lines
new_f.write(old_f.read(param)) new_f.write(old_f.read(param))
elif action == "-": # Delete lines elif action == "-": # Delete lines
@ -41,4 +43,6 @@ def patch(old_f, actions):
elif action == "+": # Add lines elif action == "+": # Add lines
for add_line in param: for add_line in param:
new_f.write(add_line) new_f.write(add_line)
else:
raise "Unknown action: %s" % action
return new_f return new_f