Commit Graph

96 Commits

Author SHA1 Message Date
rocky
dfa3a41dc9 Merge hell 2024-05-30 05:01:57 -04:00
rocky
5dd265021f Add --asm++ or -A option 2024-03-13 21:34:47 -04:00
rocky
a1ffe3e106 Make uncompyle6 CLI work again 2024-02-12 05:16:59 -05:00
rocky
a51cd0df5d Merge branch 'python-3.0-to-3.2' into python-2.4 2024-02-11 23:52:59 -05:00
rocky
e9ff6136b5 Merge branch 'master' into python-3.3-to-3.5 2024-02-11 23:40:30 -05:00
rocky
8348d86b09 Better annotation parsing for < 3.6 2024-02-11 19:46:13 -05:00
rocky
f9f5a64c87 Attempt to fix annotation bugs 2024-02-11 19:14:50 -05:00
rocky
70690f2ede Sync with master 2024-02-11 12:19:27 -05:00
rocky
ab1b81a8da Merge branch 'python-3.0-to-3.2' into python-2.4 2024-02-11 12:18:39 -05:00
rocky
c048b26d4e Merge branch 'master' into python-3.3-to-3.5 2024-02-11 11:57:12 -05:00
rocky
454fac4adb Handle 3.3 MAKE_FUNCTION annotation args properly 2024-02-11 11:50:25 -05:00
rocky
ece788e09e Merge hell 2024-02-11 09:18:43 -05:00
rocky
d8e212c9ea Merge branch 'master' into python-3.3-to-3.5 2024-02-11 09:11:03 -05:00
rocky
dd8ee1466d Redo uncompyel6 options ...
Use click now and make more like decompyle3
2024-02-10 13:24:09 -05:00
rocky
4aa7f1ce67 Merge branch 'python-3.0-to-3.2' into python-2.4 2023-07-29 13:03:38 -04:00
rocky
6b01da76ea Merge branch 'master' into python-3.3-to-3.5 2023-07-29 12:57:37 -04:00
rocky
227f494fa8 Double -a option show asm before tokenization 2023-07-04 07:13:54 -04:00
rocky
96fd3312a6 Merge from 3.0 branch 2023-07-01 10:58:29 -04:00
rocky
489d479bd0 Merge branch 'python-3.0-to-3.2' into python-2.4 2023-07-01 10:54:04 -04:00
rocky
df1772164c Merge from master 2023-07-01 10:33:04 -04:00
rocky
4b296e1ead Correct generator function parsing for 3.3..3.5 2023-06-30 15:43:27 -04:00
rocky
aae7777d92 Merge conflicts 2023-06-30 02:28:23 -04:00
rocky
2bfd0434a7 Merge branch 'python-3.0-to-3.2' into python-2.4 2023-06-30 02:28:10 -04:00
rocky
4bd6e609dd formatting 2023-06-30 02:05:55 -04:00
rocky
0897d47afa Merge branch 'master' into python-3.3-to-3.5 2023-06-30 01:57:41 -04:00
rocky
568b64b59e Allow decompilation of older bytecode from 3.9+ 2023-06-16 07:30:25 -04:00
rocky
41d26bde79 Lint some files 2023-05-29 11:00:44 -04:00
rocky
7e362a8635 Merge branch 'python-3.0-to-3.2' into python-2.4 2022-11-27 05:11:09 -05:00
rocky
54e9de4a7d Merge branch 'master' into python-3.3-to-3.5 2022-11-27 05:01:44 -05:00
James Hilliard
6787a582cf Fix status_msg args
Fixes:
uncompyle6/bin/uncompile.py", line 201, in main_bin
    mess = status_msg(do_verify, *result)
TypeError: status_msg() takes 5 positional arguments but 6 were given
2022-11-05 18:59:13 -04:00
rocky
2efe2b5b47 WIP 2022-03-04 05:07:31 -05:00
rocky
997942e235 Merge branch 'master' into python-3.3-to-3.5 2022-01-14 08:04:01 -05:00
rocky
a381b4663b Adapt for recent options changes in
-T option structure changed.
2022-01-09 16:01:32 -05:00
rocky
9ec8918c1f Merge branch 'python-3.3-to-3.5' into python-2.4 2021-10-28 18:54:42 -04:00
rocky
08ed185608 Merge branch 'master' into python-3.3-to-3.5 2021-10-28 18:46:08 -04:00
rocky
32c4b84458 Better handling of bytecode errors 2021-10-28 18:37:54 -04:00
rocky
5390e3b838 Merge hell 2021-10-26 06:42:23 -04:00
rocky
8aeb0aad8c Merge branch 'python-3.3-to-3.5' into python-2.4 2021-10-26 06:41:20 -04:00
rocky
d0ca7b0363 Loosen check to allow running from 2.4-3.10
We still only can *decompile* 2.4-3.8
2021-10-26 06:21:51 -04:00
rocky
5c2af69925 Loosen check to allow running from 2.4-3.10
We still only can *decompile* 2.4-3.8
2021-10-26 06:08:17 -04:00
rocky
f472275196 Merge branch 'master' into python-2.4 2021-06-15 22:47:45 -04:00
Renat Iliev
2b154e0b88 'NoneType' object is not iterable with numproc > 1
main calls with source_paths=None, but it needs to be iterable
2021-06-14 19:50:18 +03:00
rocky
3ca66d0184 Merge branch 'master' into python-2.4 2020-10-31 11:37:53 -04:00
rocky
70b7e51df6 VERSION -> version 2020-10-31 11:25:06 -04:00
rocky
94c01d395a Merge branch 'master' into python-2.4 2019-08-24 08:32:21 -04:00
rocky
1ebfde6927 Add tree transformation phase...
if ... else if ... ->  if ... elif ..
if .. : raise AsssertionError ->  assert

Add options --tree=before --tree=after  -T expanded to include this

This code ported from decompyle3. x0ret did all the heavy lifting.
2019-08-21 09:00:09 -04:00
rocky
e56088b566 Need parens in unpack in 2.4ish 2019-07-03 20:04:45 -04:00
rocky
1c21e1c9d2 Merge branch 'master' into python-2.4 2019-07-03 18:35:11 -04:00
rocky
e55a0410c9 weak-verify -> syntax-verify. More bytecode tests 2019-07-01 10:23:43 -04:00
rocky
f9fd63d5f5 Merge branch 'master' into python-2.4 2019-06-05 11:38:37 -04:00