File tree Expand file tree Collapse 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 Expand file tree Collapse file tree 2 files changed +26
-86
lines changed Original file line number Diff line number Diff line change @@ -49,59 +49,29 @@ import difflib
49
49
import yaml
50
50
51
51
data1 = {
52
- " firstName" : " John" ,
53
- " lastName" : " Doe" ,
52
+ " Name" : " John" ,
54
53
" 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
- ]
71
54
}
72
55
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 ,
88
58
}
89
59
diff = difflib.diff(yaml.encode(data1), yaml.encode(data2))
90
60
```
91
61
92
62
The expected output is the diff as below:
93
63
94
64
```
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
105
75
```
106
76
107
77
** 🏄 Language Updates**
Original file line number Diff line number Diff line change @@ -49,59 +49,29 @@ import difflib
49
49
import yaml
50
50
51
51
data1 = {
52
- " firstName" : " John" ,
53
- " lastName" : " Doe" ,
52
+ " Name" : " John" ,
54
53
" 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
- ]
71
54
}
72
55
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 ,
88
58
}
89
59
diff = difflib.diff(yaml.encode(data1), yaml.encode(data2))
90
60
```
91
61
92
62
然后,对应配置的 diff 如下:
93
63
94
64
```
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
105
75
```
106
76
107
77
** 🏄 语言更新**
You can’t perform that action at this time.
0 commit comments