From 278756be49276ebcd3a4fe8fda40ba1528b7387a Mon Sep 17 00:00:00 2001 From: rocky Date: Wed, 29 Nov 2017 10:12:09 -0500 Subject: [PATCH] Administrivia and more coverage --- admin-tools/pyenv-newer-versions | 2 ++ admin-tools/pyenv-older-versions | 3 +++ admin-tools/pyenv-oldest-versions | 9 +++++++++ test/bytecode_2.1/10_del.pyc | Bin 0 -> 835 bytes test/bytecode_3.2/01_delete_deref.pyc | Bin 414 -> 0 bytes test/bytecode_3.3/01_delete_deref.pyc | Bin 447 -> 0 bytes test/bytecode_3.3/10_del.pyc | Bin 550 -> 851 bytes test/bytecode_3.4/01_delete_deref.pyc | Bin 325 -> 0 bytes test/bytecode_3.4/10_del.pyc | Bin 463 -> 671 bytes test/bytecode_3.5/10_del.pyc | Bin 463 -> 671 bytes test/bytecode_3.6/10_del.pyc | Bin 0 -> 614 bytes test/simple_source/stmts/10_del.py | 12 ++++++++++++ 12 files changed, 26 insertions(+) create mode 100644 admin-tools/pyenv-oldest-versions create mode 100644 test/bytecode_2.1/10_del.pyc delete mode 100644 test/bytecode_3.2/01_delete_deref.pyc delete mode 100644 test/bytecode_3.3/01_delete_deref.pyc delete mode 100644 test/bytecode_3.4/01_delete_deref.pyc create mode 100644 test/bytecode_3.6/10_del.pyc diff --git a/admin-tools/pyenv-newer-versions b/admin-tools/pyenv-newer-versions index c08a3ab8..229fb7b4 100644 --- a/admin-tools/pyenv-newer-versions +++ b/admin-tools/pyenv-newer-versions @@ -1,4 +1,6 @@ # -*- shell-script -*- +# Sets PYVERSIONS to be pyenv versions that +# we can use in the master branch. if [[ $0 == ${BASH_SOURCE[0]} ]] ; then echo "This script should be *sourced* rather than run directly through bash" exit 1 diff --git a/admin-tools/pyenv-older-versions b/admin-tools/pyenv-older-versions index 63e4e202..f2e792cb 100644 --- a/admin-tools/pyenv-older-versions +++ b/admin-tools/pyenv-older-versions @@ -1,4 +1,7 @@ # -*- shell-script -*- +# Sets PYVERSIONS to be pyenv versions that +# we can use in the python-2.4 branch. + if [[ $0 == ${BASH_SOURCE[0]} ]] ; then echo "This script should be *sourced* rather than run directly through bash" exit 1 diff --git a/admin-tools/pyenv-oldest-versions b/admin-tools/pyenv-oldest-versions new file mode 100644 index 00000000..254fcf85 --- /dev/null +++ b/admin-tools/pyenv-oldest-versions @@ -0,0 +1,9 @@ +# -*- shell-script -*- +# Sets PYVERSIONS to be all pyenv the oldest versions we have. +# These are not covered (yet) by uncompyle6, although +# some programs do work here. +if [[ $0 == ${BASH_SOURCE[0]} ]] ; then + echo "This script should be *sourced* rather than run directly through bash" + exit 1 +fi +export PYVERSIONS='2.1.3 2.2.3 2.3.7' diff --git a/test/bytecode_2.1/10_del.pyc b/test/bytecode_2.1/10_del.pyc new file mode 100644 index 0000000000000000000000000000000000000000..41a3f854e4101e68c2ef637881522c853fd628dd GIT binary patch literal 835 zcmbVJ%T5A85UiPDmv8a9a*YMfKX3B@*!)fApQcRnH^l@dCsFd;_*1F%=Zik4iMnR5543lg$2X68BFiN{_HD9^z<;B3Jv(9qu*v5FVsKK!p zqm81b8q%~$85+Yk@k~LBho;${WW)W4r|69oQH6ZWTR}$DwAjdH_m{Wz%FNCWM=dOI~{CkBE)2nr6fC=1E|R+H$SB`C)EyYKFAaR!;?mq diff --git a/test/bytecode_3.3/01_delete_deref.pyc b/test/bytecode_3.3/01_delete_deref.pyc deleted file mode 100644 index 06a987bbe58a02834ecf507eb9d9787fa5a72cd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmb79y9&ZU5S&vB5e31@9}ugkh@FUEkj6?I$>S8^B;t8R3OiA;^9OAGO=m9<#LkeN z+g)aMc3;g_yANb&LR@15Lt?n&|*e1++A6u0ch(Rd|5jOC)T+bv+pd8JwP|yd5~yV<3FXzVrkquuaxzrcn-vtW=ls)X~57+76Aii8LiPyAqR!vTZ_%8sFxfD%Jo1 delta 131 zcmcc2wv0t%9uF^<@f^9R^$ZLQ$v_MT>_CbTKfrGccqvf^-1YwlOf&f(-y_@`LLFX$9#N2I68CAko19G?meBB|{NNSd;M< zVsWjc#Sl_@fJ|#6LwImft6{V)>6;$40Oai&0802gQ z#wwmfJ)4~TV$K7Bfx& diff --git a/test/bytecode_3.4/10_del.pyc b/test/bytecode_3.4/10_del.pyc index 1aa477c0cbeddf6dff66ff723726cbdff89adf5d..269d2be38e09421f3cbe1e17aed76d85908acf10 100644 GIT binary patch delta 337 zcmYjMJxfC|6g@ZTd#!Ea6GZR>1aWDX{sNKyf-W7zZqFB-3PLhjP#3G>R-Bw%{UL4+ z?ym0s2G5NZyyTpmT+X>kKI}`;|8~A>-}k4_0({|LwW&u$dL;$F>@N=2QMVAf2tC{a z(*nUEbh4(U#AHw{-xfEUnldEV=*f*rEnWe;LfWBt1nz-zLEtjD1Fkp-9Aw9hy0vsy z>3DdyN@m-iu4s%o k+@abge#2tr=~PY*^h-(GrLne>ws^B8p1da;rW9BF0PX!M3jhEB delta 128 zcmbQwdY)P19S<*;;CJq*^$ZLQkAWBt*nunuATFK*BvN=LYP5>;G9w-i~wOG5kmj~ diff --git a/test/bytecode_3.5/10_del.pyc b/test/bytecode_3.5/10_del.pyc index 4bf9719ff67967037154eee3b0cf5cecfd96e8c1..3a448bae6458eaffa5f2f5cf6a09fe7db196e36f 100644 GIT binary patch delta 337 zcmYjMJxc>Y6r8u4yTs(y6U5*L2x5~o`2`aE1!+=<=`Oce1%%zofZ7-pyI^Hy>kqNB zu(!=0$-Fg!kDb}s$IRQ^Z~LD0y3V!j*YV^{fEE5#llq*9A0+RVy~XJ^ss?-;zJmu~ zlED}7t)ywmG47Yk&&B<&rVI%-IC8C0i&wyI5DzF`fG6Ne;JFMQfm;p&2iZ}rZY|vv zX{^5L4tQ3Nj6#RUzWm6I(mWl*xL`AEkq(L2Ai-EOFRH=W?7FUIaX6T6lF9a`OBzE8 jx2X1s->_JDy_Aa+{ZiC+Zmcb(DbDPPBOl3*$)(8F*BL1^ delta 128 zcmbQwdY)NBjF*>7@H=_COD%s1UW^Al_W~NPKuo-I@m3E6I)#{&lG5r6i{^okxMo5`3CZCA#Cp0 z7wnXP7H|Yy0gqv@V}Kk-IgVpV_eWGW99CFkAmCm&2r>iJNAAyPm`g| zmL^U*b}?Jn&gI3BlC(Wv<$983$I?hFfHrl;!z7s^t|V-W;T4`?g0l0*e=Mi!K`b;m za!VBb#Ml$Ol*S4(;%+6dE)CY0VU8G1Ijk%WN~v{i)b6HPJW6f9J^m3Ew0+)WqAA2a zXD1w`7!`)vhyf$Z7;zmcBcwtfdcS#&agJmHd6Sh(M~8na+UI_EmeDdz`qIwIAV(=3 Rpof8KV8GbInsU&0zX6!mUv~fi literal 0 HcmV?d00001 diff --git a/test/simple_source/stmts/10_del.py b/test/simple_source/stmts/10_del.py index 65d1aa3a..43576bcb 100644 --- a/test/simple_source/stmts/10_del.py +++ b/test/simple_source/stmts/10_del.py @@ -1,6 +1,9 @@ +# Ensures opcodes DELETE_SUBSCR and DELETE_GLOBAL are covered a = (1, 2, 3) +# DELETE_NAME del a +# DELETE_SUBSCR b = [4, 5, 6] del b[1] del b[:] @@ -14,5 +17,14 @@ del d[1:3:2] e = ('a', 'b') def foo(): + # covers DELETE_GLOBAL global e del e + +def a(): + del z + def b(y): + # covers DELETE_FAST + del y + # LOAD_DEREF + return z