Skip to content

Commit 03ec99a

Browse files
committed
Fix errors in manifests
preserve_locals/globals should be a list. Cast it to a list if it looks like it has mistaken been passed as a string.
1 parent e128644 commit 03ec99a

File tree

4 files changed

+36
-16
lines changed

4 files changed

+36
-16
lines changed

src/python_minifier/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,12 @@ def minify(
168168

169169
if preserve_locals is None:
170170
preserve_locals = []
171+
elif isinstance(preserve_locals, str):
172+
preserve_locals = [preserve_locals]
171173
if preserve_globals is None:
172174
preserve_globals = []
175+
elif isinstance(preserve_globals, str):
176+
preserve_globals = [preserve_globals]
173177

174178
preserve_locals.extend(module.preserved)
175179
preserve_globals.extend(module.preserved)

xtest/manifests/python3.10_test_manifest.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -865,17 +865,21 @@
865865
rename_globals: true
866866
/usr/local/lib/python3.10/test/test_contextlib_async.py:
867867
- options:
868-
preserve_locals: baz
868+
preserve_locals:
869+
- baz
869870
- options:
870871
rename_globals: true
871-
preserve_locals: baz
872+
preserve_locals:
873+
- baz
872874
- options:
873875
remove_literal_statements: true
874-
preserve_locals: baz
876+
preserve_locals:
877+
- baz
875878
- options:
876879
remove_literal_statements: true
877880
rename_globals: true
878-
preserve_locals: baz
881+
preserve_locals:
882+
- baz
879883
/usr/local/lib/python3.10/test/test_copy.py:
880884
- options: {}
881885
- options:

xtest/manifests/python3.11_test_manifest.yaml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,17 +188,21 @@
188188
/usr/local/lib/python3.11/test/test_asyncio/test_futures.py: []
189189
/usr/local/lib/python3.11/test/test_asyncio/test_futures2.py:
190190
- options:
191-
preserve_locals: future
191+
preserve_locals:
192+
- future
192193
- options:
193194
rename_globals: true
194-
preserve_locals: future
195+
preserve_locals:
196+
- future
195197
- options:
196198
remove_literal_statements: true
197-
preserve_locals: future
199+
preserve_locals:
200+
- future
198201
- options:
199202
remove_literal_statements: true
200203
rename_globals: true
201-
preserve_locals: future
204+
preserve_locals:
205+
- future
202206
/usr/local/lib/python3.11/test/test_asyncio/test_locks.py:
203207
- options: {}
204208
- options:
@@ -2904,17 +2908,21 @@
29042908
rename_globals: true
29052909
/usr/local/lib/python3.11/test/test_opcache.py:
29062910
- options:
2907-
preserve_locals: Class
2911+
preserve_locals:
2912+
- Class
29082913
- options:
29092914
rename_globals: true
2910-
preserve_locals: Class
2915+
preserve_locals:
2916+
- Class
29112917
- options:
29122918
remove_literal_statements: true
2913-
preserve_locals: Class
2919+
preserve_locals:
2920+
- Class
29142921
- options:
29152922
remove_literal_statements: true
29162923
rename_globals: true
2917-
preserve_locals: Class
2924+
preserve_locals:
2925+
- Class
29182926
/usr/local/lib/python3.11/test/test_opcodes.py:
29192927
- options: {}
29202928
- options:

xtest/manifests/python3.12_test_manifest.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4740,20 +4740,24 @@
47404740
status: passing
47414741
/usr/local/lib/python3.12/test/test_opcache.py:
47424742
- options:
4743-
preserve_locals: Class
4743+
preserve_locals:
4744+
- Class
47444745
remove_literal_statements: true
47454746
rename_globals: true
47464747
status: passing
47474748
- options:
4748-
preserve_locals: Class
4749+
preserve_locals:
4750+
- Class
47494751
rename_globals: true
47504752
status: passing
47514753
- options:
4752-
preserve_locals: Class
4754+
preserve_locals:
4755+
- Class
47534756
remove_literal_statements: true
47544757
status: passing
47554758
- options:
4756-
preserve_locals: Class
4759+
preserve_locals:
4760+
- Class
47574761
status: passing
47584762
/usr/local/lib/python3.12/test/test_opcodes.py:
47594763
- options:

0 commit comments

Comments
 (0)