Skip to content

Commit 03963fe

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Make license identifiers python-safe
Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
1 parent cfa072b commit 03963fe

File tree

11 files changed

+70
-69
lines changed

11 files changed

+70
-69
lines changed

‎src/licensedcode/detection.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,8 @@ def get_new_identifier_from_detections(initial_detection, detections_added, lice
554554
]
555555
identifiers.append(initial_detection["identifier"])
556556
uuid = get_uuid_on_content(content=sorted(identifiers))
557-
return f"{license_expression}-{uuid}"
557+
expression = python_safe_name(s=str(license_expression))
558+
return f"{expression}-{uuid}"
558559

559560

560561
@attr.s

‎tests/licensedcode/data/plugin_license/license_reference/license-ref-see-copying.expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"license_detections": [
33
{
4-
"identifier": "apache-2.0-1c807a43-2040-70af-75aa-c343d5f2b90c",
4+
"identifier": "apache_2_0-1c807a43-2040-70af-75aa-c343d5f2b90c",
55
"license_expression": "apache-2.0",
66
"detection_count": 1,
77
"detection_log": [
@@ -86,7 +86,7 @@
8686
"detection_log": [
8787
"unknown-reference-to-local-file"
8888
],
89-
"identifier": "apache-2.0-1c807a43-2040-70af-75aa-c343d5f2b90c"
89+
"identifier": "apache_2_0-1c807a43-2040-70af-75aa-c343d5f2b90c"
9090
}
9191
],
9292
"license_clues": [],

‎tests/licensedcode/data/plugin_license/license_reference/scan-unknown-reference-copyright.expected.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"license_detections": [
33
{
4-
"identifier": "x11-xconsortium-veillard-61f804f6-d484-92ca-09b5-26be51ac974e",
4+
"identifier": "x11_xconsortium_veillard-61f804f6-d484-92ca-09b5-26be51ac974e",
55
"license_expression": "x11-xconsortium-veillard",
66
"detection_count": 2,
77
"detection_log": [
88
"unknown-reference-to-local-file"
99
]
1010
},
1111
{
12-
"identifier": "x11-xconsortium-veillard-50c015bd-e4e1-c6fe-eb82-9551473dd8e1",
12+
"identifier": "x11_xconsortium_veillard-50c015bd-e4e1-c6fe-eb82-9551473dd8e1",
1313
"license_expression": "x11-xconsortium-veillard",
1414
"detection_count": 1,
1515
"detection_log": [
@@ -94,7 +94,7 @@
9494
"detection_log": [
9595
"unknown-reference-to-local-file"
9696
],
97-
"identifier": "x11-xconsortium-veillard-61f804f6-d484-92ca-09b5-26be51ac974e"
97+
"identifier": "x11_xconsortium_veillard-61f804f6-d484-92ca-09b5-26be51ac974e"
9898
}
9999
],
100100
"license_clues": [],
@@ -140,7 +140,7 @@
140140
"detection_log": [
141141
"unknown-reference-to-local-file"
142142
],
143-
"identifier": "x11-xconsortium-veillard-61f804f6-d484-92ca-09b5-26be51ac974e"
143+
"identifier": "x11_xconsortium_veillard-61f804f6-d484-92ca-09b5-26be51ac974e"
144144
}
145145
],
146146
"license_clues": [],
@@ -206,7 +206,7 @@
206206
"detection_log": [
207207
"unknown-reference-to-local-file"
208208
],
209-
"identifier": "x11-xconsortium-veillard-50c015bd-e4e1-c6fe-eb82-9551473dd8e1"
209+
"identifier": "x11_xconsortium_veillard-50c015bd-e4e1-c6fe-eb82-9551473dd8e1"
210210
}
211211
],
212212
"license_clues": [],

‎tests/packagedcode/data/instance/python-package-instance-with-license-expected.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
6565
}
6666
],
67-
"identifier": "bsd-new-56110dee-5dcd-3acb-7774-ab2491cc76bf",
67+
"identifier": "bsd_new-56110dee-5dcd-3acb-7774-ab2491cc76bf",
6868
"detection_log": [
6969
"package-unknown-reference-to-local-file"
7070
]
@@ -142,15 +142,15 @@
142142
"detection_log": []
143143
},
144144
{
145-
"identifier": "bsd-new-56110dee-5dcd-3acb-7774-ab2491cc76bf",
145+
"identifier": "bsd_new-56110dee-5dcd-3acb-7774-ab2491cc76bf",
146146
"license_expression": "bsd-new",
147147
"detection_count": 1,
148148
"detection_log": [
149149
"package-unknown-reference-to-local-file"
150150
]
151151
},
152152
{
153-
"identifier": "bsd-new-68720980-08c9-ffb1-f28e-24c2e067385b",
153+
"identifier": "bsd_new-68720980-08c9-ffb1-f28e-24c2e067385b",
154154
"license_expression": "bsd-new",
155155
"detection_count": 1,
156156
"detection_log": [
@@ -281,7 +281,7 @@
281281
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
282282
}
283283
],
284-
"identifier": "bsd-new-56110dee-5dcd-3acb-7774-ab2491cc76bf",
284+
"identifier": "bsd_new-56110dee-5dcd-3acb-7774-ab2491cc76bf",
285285
"detection_log": [
286286
"package-unknown-reference-to-local-file"
287287
]
@@ -351,7 +351,7 @@
351351
"detection_log": [
352352
"unknown-reference-to-local-file"
353353
],
354-
"identifier": "bsd-new-68720980-08c9-ffb1-f28e-24c2e067385b"
354+
"identifier": "bsd_new-68720980-08c9-ffb1-f28e-24c2e067385b"
355355
},
356356
{
357357
"license_expression": "bsd-new",

‎tests/packagedcode/data/license_detection/reference-at-manifest/fizzler.expected.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"matched_text": "GNU GENERAL PUBLIC LICENSE"
7979
}
8080
],
81-
"identifier": "lgpl-2.0-plus AND gpl-1.0-plus-de66a0ae-df4d-ab6b-975e-8deb27c0f945",
81+
"identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-de66a0ae-df4d-ab6b-975e-8deb27c0f945",
8282
"detection_log": [
8383
"package-unknown-reference-to-local-file"
8484
]
@@ -142,26 +142,26 @@
142142
],
143143
"license_detections": [
144144
{
145-
"identifier": "lgpl-2.0-plus AND gpl-1.0-plus-17115808-8fc8-9c98-b64d-c5013bcbde1b",
145+
"identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-17115808-8fc8-9c98-b64d-c5013bcbde1b",
146146
"license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
147147
"detection_count": 1,
148148
"detection_log": [
149149
"unknown-reference-to-local-file"
150150
]
151151
},
152152
{
153-
"identifier": "lgpl-2.0-plus AND gpl-1.0-plus-de66a0ae-df4d-ab6b-975e-8deb27c0f945",
153+
"identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-2a11c930-7038-736e-5e48-b35f872691cc",
154154
"license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
155155
"detection_count": 1,
156-
"detection_log": [
157-
"package-unknown-reference-to-local-file"
158-
]
156+
"detection_log": []
159157
},
160158
{
161-
"identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-2a11c930-7038-736e-5e48-b35f872691cc",
159+
"identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-de66a0ae-df4d-ab6b-975e-8deb27c0f945",
162160
"license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
163161
"detection_count": 1,
164-
"detection_log": []
162+
"detection_log": [
163+
"package-unknown-reference-to-local-file"
164+
]
165165
}
166166
],
167167
"files": [
@@ -293,7 +293,7 @@
293293
"matched_text": "GNU GENERAL PUBLIC LICENSE"
294294
}
295295
],
296-
"identifier": "lgpl-2.0-plus AND gpl-1.0-plus-de66a0ae-df4d-ab6b-975e-8deb27c0f945",
296+
"identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-de66a0ae-df4d-ab6b-975e-8deb27c0f945",
297297
"detection_log": [
298298
"package-unknown-reference-to-local-file"
299299
]
@@ -394,7 +394,7 @@
394394
"detection_log": [
395395
"unknown-reference-to-local-file"
396396
],
397-
"identifier": "lgpl-2.0-plus AND gpl-1.0-plus-17115808-8fc8-9c98-b64d-c5013bcbde1b"
397+
"identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-17115808-8fc8-9c98-b64d-c5013bcbde1b"
398398
}
399399
],
400400
"license_clues": [],

‎tests/packagedcode/data/license_detection/reference-to-package/base.expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"detection_log": []
9999
},
100100
{
101-
"identifier": "bsd-new-af493d9f-0c66-d9f8-4538-579134812514",
101+
"identifier": "bsd_new-af493d9f-0c66-d9f8-4538-579134812514",
102102
"license_expression": "bsd-new",
103103
"detection_count": 1,
104104
"detection_log": [
@@ -270,7 +270,7 @@
270270
"detection_log": [
271271
"unknown-reference-in-file-to-package"
272272
],
273-
"identifier": "bsd-new-af493d9f-0c66-d9f8-4538-579134812514"
273+
"identifier": "bsd_new-af493d9f-0c66-d9f8-4538-579134812514"
274274
}
275275
],
276276
"license_clues": [],

‎tests/packagedcode/data/license_detection/reference-to-package/google_appengine_sdk.expected.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -196,26 +196,26 @@
196196
"detection_log": []
197197
},
198198
{
199-
"identifier": "bsd-new-cdb8fe96-c13c-043d-8031-aebb4cd77653",
199+
"identifier": "bsd_new-cdb8fe96-c13c-043d-8031-aebb4cd77653",
200200
"license_expression": "bsd-new",
201201
"detection_count": 5,
202202
"detection_log": [
203203
"unknown-reference-in-file-to-package"
204204
]
205205
},
206206
{
207-
"identifier": "bsd-new-734cc7c8-5d13-b9e1-3f7c-d04a0d9396c7",
207+
"identifier": "bsd_new-72cae3bc-4423-3a9e-be84-ee8bb5120a4d",
208208
"license_expression": "bsd-new",
209209
"detection_count": 2,
210-
"detection_log": [
211-
"unknown-reference-in-file-to-package"
212-
]
210+
"detection_log": []
213211
},
214212
{
215-
"identifier": "bsd_new-72cae3bc-4423-3a9e-be84-ee8bb5120a4d",
213+
"identifier": "bsd_new-734cc7c8-5d13-b9e1-3f7c-d04a0d9396c7",
216214
"license_expression": "bsd-new",
217215
"detection_count": 2,
218-
"detection_log": []
216+
"detection_log": [
217+
"unknown-reference-in-file-to-package"
218+
]
219219
}
220220
],
221221
"files": [
@@ -425,7 +425,7 @@
425425
"detection_log": [
426426
"unknown-reference-in-file-to-package"
427427
],
428-
"identifier": "bsd-new-cdb8fe96-c13c-043d-8031-aebb4cd77653"
428+
"identifier": "bsd_new-cdb8fe96-c13c-043d-8031-aebb4cd77653"
429429
}
430430
],
431431
"license_clues": [],
@@ -475,7 +475,7 @@
475475
"detection_log": [
476476
"unknown-reference-in-file-to-package"
477477
],
478-
"identifier": "bsd-new-cdb8fe96-c13c-043d-8031-aebb4cd77653"
478+
"identifier": "bsd_new-cdb8fe96-c13c-043d-8031-aebb4cd77653"
479479
}
480480
],
481481
"license_clues": [],
@@ -549,7 +549,7 @@
549549
"detection_log": [
550550
"unknown-reference-in-file-to-package"
551551
],
552-
"identifier": "bsd-new-734cc7c8-5d13-b9e1-3f7c-d04a0d9396c7"
552+
"identifier": "bsd_new-734cc7c8-5d13-b9e1-3f7c-d04a0d9396c7"
553553
}
554554
],
555555
"license_clues": [],
@@ -599,7 +599,7 @@
599599
"detection_log": [
600600
"unknown-reference-in-file-to-package"
601601
],
602-
"identifier": "bsd-new-734cc7c8-5d13-b9e1-3f7c-d04a0d9396c7"
602+
"identifier": "bsd_new-734cc7c8-5d13-b9e1-3f7c-d04a0d9396c7"
603603
}
604604
],
605605
"license_clues": [],
@@ -649,7 +649,7 @@
649649
"detection_log": [
650650
"unknown-reference-in-file-to-package"
651651
],
652-
"identifier": "bsd-new-cdb8fe96-c13c-043d-8031-aebb4cd77653"
652+
"identifier": "bsd_new-cdb8fe96-c13c-043d-8031-aebb4cd77653"
653653
}
654654
],
655655
"license_clues": [],
@@ -1210,7 +1210,7 @@
12101210
"detection_log": [
12111211
"unknown-reference-in-file-to-package"
12121212
],
1213-
"identifier": "bsd-new-cdb8fe96-c13c-043d-8031-aebb4cd77653"
1213+
"identifier": "bsd_new-cdb8fe96-c13c-043d-8031-aebb4cd77653"
12141214
}
12151215
],
12161216
"license_clues": [],
@@ -1284,7 +1284,7 @@
12841284
"detection_log": [
12851285
"unknown-reference-in-file-to-package"
12861286
],
1287-
"identifier": "bsd-new-cdb8fe96-c13c-043d-8031-aebb4cd77653"
1287+
"identifier": "bsd_new-cdb8fe96-c13c-043d-8031-aebb4cd77653"
12881288
}
12891289
],
12901290
"license_clues": [],

‎tests/packagedcode/data/license_detection/reference-to-package/paddlenlp.expected.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -384,26 +384,26 @@
384384
],
385385
"license_detections": [
386386
{
387-
"identifier": "apache-2.0-35de6d3f-8962-0454-2270-33aac504c123",
387+
"identifier": "apache_2_0-35de6d3f-8962-0454-2270-33aac504c123",
388388
"license_expression": "apache-2.0",
389389
"detection_count": 2,
390390
"detection_log": [
391391
"unknown-reference-in-file-to-package"
392392
]
393393
},
394394
{
395-
"identifier": "apache-2.0-abb5bcc3-dac9-a935-3392-31a86beb482a",
395+
"identifier": "apache_2_0-999670be-3d5e-ebf8-ae18-b555c26c5e80",
396396
"license_expression": "apache-2.0",
397397
"detection_count": 2,
398-
"detection_log": [
399-
"unknown-reference-to-local-file"
400-
]
398+
"detection_log": []
401399
},
402400
{
403-
"identifier": "apache_2_0-999670be-3d5e-ebf8-ae18-b555c26c5e80",
401+
"identifier": "apache_2_0-abb5bcc3-dac9-a935-3392-31a86beb482a",
404402
"license_expression": "apache-2.0",
405403
"detection_count": 2,
406-
"detection_log": []
404+
"detection_log": [
405+
"unknown-reference-to-local-file"
406+
]
407407
},
408408
{
409409
"identifier": "apache_2_0-c4e30bcd-ccfd-bbc3-d2f1-196ab911e47d",
@@ -550,7 +550,7 @@
550550
"detection_log": [
551551
"unknown-reference-to-local-file"
552552
],
553-
"identifier": "apache-2.0-abb5bcc3-dac9-a935-3392-31a86beb482a"
553+
"identifier": "apache_2_0-abb5bcc3-dac9-a935-3392-31a86beb482a"
554554
}
555555
],
556556
"license_clues": [],
@@ -661,7 +661,7 @@
661661
"detection_log": [
662662
"unknown-reference-in-file-to-package"
663663
],
664-
"identifier": "apache-2.0-35de6d3f-8962-0454-2270-33aac504c123"
664+
"identifier": "apache_2_0-35de6d3f-8962-0454-2270-33aac504c123"
665665
}
666666
],
667667
"license_clues": [],
@@ -724,7 +724,7 @@
724724
"detection_log": [
725725
"unknown-reference-in-file-to-package"
726726
],
727-
"identifier": "apache-2.0-35de6d3f-8962-0454-2270-33aac504c123"
727+
"identifier": "apache_2_0-35de6d3f-8962-0454-2270-33aac504c123"
728728
}
729729
],
730730
"license_clues": [],
@@ -1075,7 +1075,7 @@
10751075
"detection_log": [
10761076
"unknown-reference-to-local-file"
10771077
],
1078-
"identifier": "apache-2.0-abb5bcc3-dac9-a935-3392-31a86beb482a"
1078+
"identifier": "apache_2_0-abb5bcc3-dac9-a935-3392-31a86beb482a"
10791079
}
10801080
],
10811081
"other_license_expression": null,

‎tests/packagedcode/data/license_detection/reference-to-package/physics.expected.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"detection_log": []
1010
},
1111
{
12-
"identifier": "gpl-3.0-76e8f741-ece2-d587-493c-92b0b1e4bdfe",
12+
"identifier": "gpl_3_0-76e8f741-ece2-d587-493c-92b0b1e4bdfe",
1313
"license_expression": "gpl-3.0",
1414
"detection_count": 1,
1515
"detection_log": [
1616
"unknown-reference-in-file-to-nonexistent-package"
1717
]
1818
},
1919
{
20-
"identifier": "gpl-3.0-e907b820-6f8c-81c4-38c5-75006ae093a4",
20+
"identifier": "gpl_3_0-e907b820-6f8c-81c4-38c5-75006ae093a4",
2121
"license_expression": "gpl-3.0",
2222
"detection_count": 1,
2323
"detection_log": [
@@ -318,7 +318,7 @@
318318
"detection_log": [
319319
"unknown-reference-in-file-to-nonexistent-package"
320320
],
321-
"identifier": "gpl-3.0-e907b820-6f8c-81c4-38c5-75006ae093a4"
321+
"identifier": "gpl_3_0-e907b820-6f8c-81c4-38c5-75006ae093a4"
322322
}
323323
],
324324
"license_clues": [],
@@ -431,7 +431,7 @@
431431
"detection_log": [
432432
"unknown-reference-in-file-to-nonexistent-package"
433433
],
434-
"identifier": "gpl-3.0-76e8f741-ece2-d587-493c-92b0b1e4bdfe"
434+
"identifier": "gpl_3_0-76e8f741-ece2-d587-493c-92b0b1e4bdfe"
435435
}
436436
],
437437
"license_clues": [],

0 commit comments

Comments
 (0)