Commit Graph

186 Commits

Author SHA1 Message Date
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
9c5addc0f0 Python 2.5 compatability 2024-02-04 13:56:28 -05:00
rocky
aadc66fe4a Merge branch 'python-3.0-to-3.2' into python-2.4 2024-02-04 13:18:47 -05:00
rocky
ef92f08f56 Black files 2024-02-04 12:29:30 -05:00
rocky
bdc751f444 Merge branch 'master' into python-3.3-to-3.5 2024-02-04 12:25:41 -05:00
rocky
e65a2db971 Small tweak 2024-02-03 18:40:38 -05:00
rocky
9f9074c285 Add a type annotation 2024-02-03 15:43:07 -05:00
rocky
5f29d14608 Fix --linemap option, yet again. 2024-02-03 15:08:58 -05:00
rocky
db6c7159f8 lint 2024-02-03 14:47:08 -05:00
rocky
d249c522a7 Fix up linemap option 2024-02-03 12:37:48 -05:00
rocky
dcc9d1a571 Fix spelling via "codespell" 2023-12-17 10:52:32 -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
18f253ffbe 3.3 compatibility 2023-07-29 12:57:52 -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
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
0897d47afa Merge branch 'master' into python-3.3-to-3.5 2023-06-30 01:57:41 -04:00
rocky
41d26bde79 Lint some files 2023-05-29 11:00:44 -04:00
rocky
43ed4f249e Merge branch 'python-3.3-to-3.5' into python-2.4 2022-09-16 15:53:56 -04:00
rocky
e4e9cb2758 Merge branch 'master' into python-3.3-to-3.5 2022-09-16 15:45:05 -04:00
rocky
4b2a2e218a Misc lint stuff from pycharm...
that has been applied to decompyle3 already
2022-09-16 15:38:13 -04:00
rocky
c8b94cf48f Small tewaks 2022-04-27 05:06:14 -04:00
rocky
464801bcb3 Correct type annotation on decompile()
Fixes #391
2022-04-21 20:10:33 -04:00
rocky
6e00a3bdbb Merge branch 'python-3.3-to-3.5' into python-2.4 2022-03-31 06:44:20 -04:00
rocky
c5bc21bf6a Correct some 2.6 bugs in chained compare ...
and other bugs

* main.py: was botching a version triple test
* parse2{5,6}.py: Add 2.6 try/except end position checking via COME_FROM offsets
* parse26.py: adjust grammar rule for chained-compare2

such as in try-except
2022-03-05 03:54:20 -05:00
rocky
f89a3e8fa1 Remove some 3.6ish type annotations 2022-03-04 05:16:12 -05:00
rocky
2efe2b5b47 WIP 2022-03-04 05:07:31 -05:00
rocky
05f743ed14 Merge hell 2022-01-14 08:09:02 -05:00
rocky
a93bec73cf merge hell 2022-01-14 08:04:33 -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
15761acd0d Revise options processing. Sync with decompyle3
We should now handle passing assembly options or functions and
subroutines more properly.

The "%P" and "%p" specifiers now allow lists of nonterminals like "%c"
and "%C" do.

version was bumped because top-level main parameter args change slightly.
2022-01-09 04:11:09 -05:00
rocky
000c060093 One more PYTHON_VERSION_TRIPLE conversion 2021-10-26 06:49:49 -04:00
rocky
39d79217ca Merge hell 2021-10-26 06:47:35 -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
a2e34ab75c Merge branch 'master' into python-3.3-to-3.5 2021-10-26 06:19:01 -04:00
rocky
ea26084e6d Modernize and sync with decompyle3 better 2021-10-25 09:13:47 -04:00
rocky
1b4b6b334e Merge branch 'master' into python-3.3-to-3.5 2021-10-25 09:09:51 -04:00
rocky
482dbb5c82 Modernize and sync with decompyle3 better 2021-10-25 09:04:12 -04:00
rocky
381a470d90 Merge branch 'python-3.3-to-3.5' into python-2.4 2021-10-23 16:02:28 -04:00
rocky
7387e5094b More version tuple conversions 2021-10-23 15:54:14 -04:00
rocky
a0cb9c5d6a merge hell 2020-10-31 11:37:58 -04:00
rocky
3ca66d0184 Merge branch 'master' into python-2.4 2020-10-31 11:37:53 -04:00