Skip to content

Commit 92d2240

Browse files
committed
fix: use simple case for difflib
Signed-off-by: zongz <[email protected]>
1 parent 110f66d commit 92d2240

File tree

2 files changed

+26
-86
lines changed
  • blog/2024-05-29-newsletter
  • i18n/zh-CN/docusaurus-plugin-content-blog/2024-05-29-newsletter

2 files changed

+26
-86
lines changed

blog/2024-05-29-newsletter/index.md

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -49,59 +49,29 @@ import difflib
4949
import yaml
5050

5151
data1 = {
52-
"firstName": "John",
53-
"lastName": "Doe",
52+
"Name": "John",
5453
"age": 30,
55-
"address": {
56-
"streetAddress": "1234 Main St",
57-
"city": "New York",
58-
"state": "NY",
59-
"postalCode": "10001"
60-
},
61-
"phoneNumbers": [
62-
{
63-
"type": "home",
64-
"number": "212-555-1234"
65-
},
66-
{
67-
"type": "work",
68-
"number": "646-555-5678"
69-
}
70-
]
7154
}
7255
data2 = {
73-
"firstName": "John",
74-
"lastName": "Doe",
75-
"age": 30,
76-
"address": {
77-
"streetAddress": "1234 Main St",
78-
"city": "New York",
79-
"state": "NY",
80-
"postalCode": None
81-
},
82-
"phoneNumbers": [
83-
{
84-
"type": "work",
85-
"number": "646-555-5678"
86-
}
87-
]
56+
"Name": "John",
57+
"age": 20,
8858
}
8959
diff = difflib.diff(yaml.encode(data1), yaml.encode(data2))
9060
```
9161

9262
The expected output is the diff as below:
9363

9464
```
95-
+ postalCode: null
96-
+ phoneNumbers:
97-
+ - type: work
98-
+ number: '646-555-5678'
99-
- postalCode: '10001'
100-
- phoneNumbers:
101-
- - type: home
102-
- number: '212-555-1234'
103-
- - type: work
104-
- number: '646-555-5678'
65+
data1:
66+
Name: John
67+
age: 30
68+
data2:
69+
Name: John
70+
age: 20
71+
diff: |2
72+
Name: John
73+
+ age: 20
74+
- age: 30
10575
```
10676

10777
**🏄 Language Updates**

i18n/zh-CN/docusaurus-plugin-content-blog/2024-05-29-newsletter/index.md

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -49,59 +49,29 @@ import difflib
4949
import yaml
5050

5151
data1 = {
52-
"firstName": "John",
53-
"lastName": "Doe",
52+
"Name": "John",
5453
"age": 30,
55-
"address": {
56-
"streetAddress": "1234 Main St",
57-
"city": "New York",
58-
"state": "NY",
59-
"postalCode": "10001"
60-
},
61-
"phoneNumbers": [
62-
{
63-
"type": "home",
64-
"number": "212-555-1234"
65-
},
66-
{
67-
"type": "work",
68-
"number": "646-555-5678"
69-
}
70-
]
7154
}
7255
data2 = {
73-
"firstName": "John",
74-
"lastName": "Doe",
75-
"age": 30,
76-
"address": {
77-
"streetAddress": "1234 Main St",
78-
"city": "New York",
79-
"state": "NY",
80-
"postalCode": None
81-
},
82-
"phoneNumbers": [
83-
{
84-
"type": "work",
85-
"number": "646-555-5678"
86-
}
87-
]
56+
"Name": "John",
57+
"age": 20,
8858
}
8959
diff = difflib.diff(yaml.encode(data1), yaml.encode(data2))
9060
```
9161

9262
然后,对应配置的 diff 如下:
9363

9464
```
95-
+ postalCode: null
96-
+ phoneNumbers:
97-
+ - type: work
98-
+ number: '646-555-5678'
99-
- postalCode: '10001'
100-
- phoneNumbers:
101-
- - type: home
102-
- number: '212-555-1234'
103-
- - type: work
104-
- number: '646-555-5678'
65+
data1:
66+
Name: John
67+
age: 30
68+
data2:
69+
Name: John
70+
age: 20
71+
diff: |2
72+
Name: John
73+
+ age: 20
74+
- age: 30
10575
```
10676

10777
**🏄 语言更新**

0 commit comments

Comments
 (0)