Commit Graph

162 Commits

Author SHA1 Message Date
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
rocky
70b7e51df6 VERSION -> version 2020-10-31 11:25:06 -04:00
rocky
c105edff47 Merge branch 'master' into python-2.4 2020-07-21 18:52:31 -04:00
rocky
f62512dd65 Clarify a warning message 2020-07-19 20:36:18 -04:00
rocky
6c8b3bfbe9 Merge branch 'master' into python-2.4 2020-06-26 08:47:02 -04:00
rocky
e3720515ae Adjust for newer xdis 2020-06-21 20:20:25 -04:00
rocky
cb411bcd04 Merge branch 'master' into python-2.4 2020-05-19 01:24:08 -04:00
rocky
5a83c7c643 Simplify imports again using xdis 4.6.0 2020-05-19 00:53:53 -04:00
rocky
0e0c5b91fc Merge branch 'master' into python-2.4 2020-04-20 23:11:19 -04:00
rocky
1d7e8f1617 Update to use xdis 4.4.0 ...
with more correct SipHash and other needed bug fixes.
2020-04-20 10:47:34 -04:00
rocky
f5bcdeec95 Merge branch 'master' into python-2.4 2020-04-16 13:09:07 -04:00
rocky
869e48877c Convert to use xdis 4.3.0 or greater 2020-04-16 08:41:53 -04:00
rocky
880a60c3e4 Merge branch 'master' into python-2.4 2020-04-11 09:58:36 -04:00
rocky
3dcc20f6d7 Small spelling typo...
Fixes #311
2020-04-04 02:38:32 -04:00
rocky
e30051b460 Merge branch 'master' into python-2.4 2020-01-26 12:00:11 -05:00
rocky
e80e72e6ab ifelsestmt transform must object types more 2020-01-26 10:12:26 -05:00
rocky
2c608c7909 Merge branch 'master' into python-2.4 2020-01-21 06:50:49 -05:00
rocky
cbd45a93ab Warn about byte type when decompiling Python3 from Python2 2020-01-14 12:07:42 -05:00
rocky
a3932c7aec Merge branch 'master' into python-2.4 2019-12-23 11:11:00 -05:00
rocky
ddffc2c078 blacken main.py 2019-12-23 04:44:40 -05:00
rocky
1c8f885629 2.5 bugs...
Handling "with"
Go over 2.5 runtests.sh exclusions
2019-12-09 06:53:40 -05: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
43b1981244 Except for 2.4 2019-07-04 10:24:08 -04:00
rocky
18bb1bc9e3 Fix Python 2.xisms 2019-06-23 18:15:53 -04:00