jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 09:22:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into python-2.4

Browse Source
This commit is contained in:
rocky
2017-10-12 07:05:34 -04:00
parent ca9c227837 b1e650a7bd
commit 47f1d888eb
25 changed files with 349 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uncompyle6/semantics/consts.py
View File

@@ -173,7 +173,11 @@ TABLE_DIRECT = {
'ret_cond': ( '%p if %p else %p', (2, 27), (0, 27), (-1, 27) ),
'conditionalnot': ( '%p if not %p else %p', (2, 27), (0, 22), (4, 27) ),
'ret_cond_not': ( '%p if not %p else %p', (2, 27), (0, 22), (-1, 27) ),
<<<<<<< HEAD
'conditional_lambda': ( '(%c if %c else %c)', 2, 0, 3),
=======
'conditional_lambda': ( '%c if %c else %c', 2, 0, 4),
>>>>>>> master
'compare': ( '%p %[-1]{pattr.replace("-", " ")} %p', (0, 19), (1, 19) ),
'cmp_list': ( '%p %p', (0, 29), (1, 30)),