Skip to content

Commit 325766c

Browse files
matthewhegartymatthewhegarty
committed
applied formatting
1 parent e9412a5 commit 325766c

File tree

2 files changed

+77
-61
lines changed

2 files changed

+77
-61
lines changed

‎diff_match_patch/diff_match_patch.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,9 +1227,9 @@ def diff_toDelta(self, diffs):
12271227
data = data.encode("utf-8")
12281228
text.append("+" + urllib.parse.quote(data, "!~*'();/?:@&=+$,# "))
12291229
elif op == self.DIFF_DELETE:
1230-
text.append("-%d" % (len(data.encode('utf-16-be')) // 2))
1230+
text.append("-%d" % (len(data.encode("utf-16-be")) // 2))
12311231
elif op == self.DIFF_EQUAL:
1232-
text.append("=%d" % (len(data.encode('utf-16-be')) // 2))
1232+
text.append("=%d" % (len(data.encode("utf-16-be")) // 2))
12331233
return "\t".join(text)
12341234

12351235
def diff_fromDelta(self, text1, delta):
@@ -1247,7 +1247,7 @@ def diff_fromDelta(self, text1, delta):
12471247
ValueError: If invalid input.
12481248
"""
12491249
diffs = []
1250-
as_utf16 = text1.encode('utf-16-be')
1250+
as_utf16 = text1.encode("utf-16-be")
12511251
pointer = 0 # Cursor in as_utf16
12521252
tokens = delta.split("\t")
12531253
for token in tokens:
@@ -1267,7 +1267,7 @@ def diff_fromDelta(self, text1, delta):
12671267
raise ValueError("Invalid number in diff_fromDelta: " + param)
12681268
if n < 0:
12691269
raise ValueError("Negative number in diff_fromDelta: " + param)
1270-
text = as_utf16[pointer: pointer + n * 2].decode('utf-16-be')
1270+
text = as_utf16[pointer : pointer + n * 2].decode("utf-16-be")
12711271
pointer += n * 2
12721272
if token[0] == "=":
12731273
diffs.append((self.DIFF_EQUAL, text))

‎diff_match_patch/tests/diff_match_patch_test.py‎

Lines changed: 73 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -833,10 +833,15 @@ def testDiffDelta(self):
833833
# Convert delta string into a diff.
834834
self.assertEqual(diffs, self.dmp.diff_fromDelta(text1, delta))
835835

836-
diffs = self.dmp.diff_main("\U0001F64B\U0001F64B", "\U0001F64B\U0001F64C\U0001F64B")
836+
diffs = self.dmp.diff_main(
837+
"\U0001F64B\U0001F64B", "\U0001F64B\U0001F64C\U0001F64B"
838+
)
837839
delta = self.dmp.diff_toDelta(diffs)
838840
self.assertEqual("=2\t+%F0%9F%99%8C\t=2", delta)
839-
self.assertEqual(diffs, self.dmp.diff_fromDelta("\U0001F64B\U0001F64B", "=2\t+%F0%9F%99%8C\t=2"))
841+
self.assertEqual(
842+
diffs,
843+
self.dmp.diff_fromDelta("\U0001F64B\U0001F64B", "=2\t+%F0%9F%99%8C\t=2"),
844+
)
840845

841846
# Verify pool of unchanged characters.
842847
diffs = [
@@ -856,61 +861,72 @@ def testDiffDelta(self):
856861

857862
# Unicode: split surrogates
858863
self.assertEqual(
859-
self.dmp.diff_toDelta([
860-
(self.dmp.DIFF_INSERT, '\U0001F171'),
861-
(self.dmp.DIFF_EQUAL, '\U0001F170\U0001F171')
862-
]),
863-
self.dmp.diff_toDelta(self.dmp.diff_main(
864-
'\U0001F170\U0001F171',
865-
'\U0001F171\U0001F170\U0001F171'
866-
)),
867-
'Inserting similar surrogate pair at beginning'
868-
)
869-
self.assertEqual(
870-
self.dmp.diff_toDelta([
871-
(self.dmp.DIFF_EQUAL, '\U0001F170'),
872-
(self.dmp.DIFF_INSERT, '\U0001F172'),
873-
(self.dmp.DIFF_EQUAL, '\U0001F171')
874-
]),
875-
self.dmp.diff_toDelta(self.dmp.diff_main(
876-
'\U0001F170\U0001F171',
877-
'\U0001F170\U0001F172\U0001F171'
878-
)),
879-
'Inserting similar surrogate pair in the middle'
880-
)
881-
self.assertEqual(
882-
self.dmp.diff_toDelta([
883-
(self.dmp.DIFF_DELETE, '\U0001F171'),
884-
(self.dmp.DIFF_EQUAL, '\U0001F170\U0001F171')
885-
]),
886-
self.dmp.diff_toDelta(self.dmp.diff_main(
887-
'\U0001F171\U0001F170\U0001F171',
888-
'\U0001F170\U0001F171'
889-
)),
890-
'Deleting similar surogate pair at the beginning'
891-
)
892-
self.assertEqual(
893-
self.dmp.diff_toDelta([
894-
(self.dmp.DIFF_EQUAL, '\U0001F170'),
895-
(self.dmp.DIFF_DELETE, '\U0001F172'),
896-
(self.dmp.DIFF_EQUAL, '\U0001F171')
897-
]),
898-
self.dmp.diff_toDelta(self.dmp.diff_main(
899-
'\U0001F170\U0001F172\U0001F171',
900-
'\U0001F170\U0001F171'
901-
)),
902-
'Deleting similar surogate pair in the middle'
903-
)
904-
self.assertEqual(
905-
self.dmp.diff_toDelta([
906-
(self.dmp.DIFF_DELETE, '\U0001F170'),
907-
(self.dmp.DIFF_INSERT, '\U0001F171')
908-
]),
909-
self.dmp.diff_toDelta(self.dmp.diff_main(
910-
'\U0001F170',
911-
'\U0001F171'
912-
)),
913-
'Swap surrogate pair'
864+
self.dmp.diff_toDelta(
865+
[
866+
(self.dmp.DIFF_INSERT, "\U0001F171"),
867+
(self.dmp.DIFF_EQUAL, "\U0001F170\U0001F171"),
868+
]
869+
),
870+
self.dmp.diff_toDelta(
871+
self.dmp.diff_main(
872+
"\U0001F170\U0001F171", "\U0001F171\U0001F170\U0001F171"
873+
)
874+
),
875+
"Inserting similar surrogate pair at beginning",
876+
)
877+
self.assertEqual(
878+
self.dmp.diff_toDelta(
879+
[
880+
(self.dmp.DIFF_EQUAL, "\U0001F170"),
881+
(self.dmp.DIFF_INSERT, "\U0001F172"),
882+
(self.dmp.DIFF_EQUAL, "\U0001F171"),
883+
]
884+
),
885+
self.dmp.diff_toDelta(
886+
self.dmp.diff_main(
887+
"\U0001F170\U0001F171", "\U0001F170\U0001F172\U0001F171"
888+
)
889+
),
890+
"Inserting similar surrogate pair in the middle",
891+
)
892+
self.assertEqual(
893+
self.dmp.diff_toDelta(
894+
[
895+
(self.dmp.DIFF_DELETE, "\U0001F171"),
896+
(self.dmp.DIFF_EQUAL, "\U0001F170\U0001F171"),
897+
]
898+
),
899+
self.dmp.diff_toDelta(
900+
self.dmp.diff_main(
901+
"\U0001F171\U0001F170\U0001F171", "\U0001F170\U0001F171"
902+
)
903+
),
904+
"Deleting similar surogate pair at the beginning",
905+
)
906+
self.assertEqual(
907+
self.dmp.diff_toDelta(
908+
[
909+
(self.dmp.DIFF_EQUAL, "\U0001F170"),
910+
(self.dmp.DIFF_DELETE, "\U0001F172"),
911+
(self.dmp.DIFF_EQUAL, "\U0001F171"),
912+
]
913+
),
914+
self.dmp.diff_toDelta(
915+
self.dmp.diff_main(
916+
"\U0001F170\U0001F172\U0001F171", "\U0001F170\U0001F171"
917+
)
918+
),
919+
"Deleting similar surogate pair in the middle",
920+
)
921+
self.assertEqual(
922+
self.dmp.diff_toDelta(
923+
[
924+
(self.dmp.DIFF_DELETE, "\U0001F170"),
925+
(self.dmp.DIFF_INSERT, "\U0001F171"),
926+
]
927+
),
928+
self.dmp.diff_toDelta(self.dmp.diff_main("\U0001F170", "\U0001F171")),
929+
"Swap surrogate pair",
914930
)
915931

916932
# 160 kb string.

0 commit comments

Comments
 (0)