Sync with python 3.2 branch

Author: rocky

admin-tools/setup-python-3.2.sh

@@ -1,6 +1,16 @@
 #!/bin/bash
 PYTHON_VERSION=3.2.6
 
+# FIXME put some of the below in a common routine
+function checkout_version {
+    local repo=$1
+    version=${2:-python-3.0-to-3.2}
+    echo Checking out $version on $repo ...
+    (cd ../$repo && git checkout $version && pyenv local $PYTHON_VERSION) && \
+	git pull
+    return $?
+}
+
 # FIXME put some of the below in a common routine
 function finish {
   cd $owd
@@ -9,10 +19,14 @@ function finish {
 export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 owd=$(pwd)
 bs=${BASH_SOURCE[0]}
+if [[ $0 == $bs ]] ; then
+    echo "This script should be *sourced* rather than run directly through bash"
+    exit 1
+fi
+
 mydir=$(dirname $bs)
-fulldir=$(readlink -f $mydir)
-(cd ../python-uncompyle6 && ./admin-tools/setup-python-3.3.sh)
+(cd $fulldir/.. && checkout_version python-spark master && checkout_version python-uncompyle6)
+cd $owd
+rm -v */.python-version || true
 
-cd $fulldir/..
 git checkout python-3.2 && pyenv local $PYTHON_VERSION && git pull
-cd $owd

test/unit/test-bytecode.py

@@ -1,40 +1,40 @@
 #!/usr/bin/env python3
-'Unit test for trepan.bytecode'
-import inspect, unittest
+"Unit test for trepan.bytecode"
+import inspect
+import unittest
+
+from xdis import IS_PYPY, PYTHON_VERSION_TRIPLE
 
 from trepan.lib import bytecode as Mcode
-from xdis import IS_PYPY, PYTHON_VERSION
 
 
 class TestByteCode(unittest.TestCase):
-
     def test_contains_make_function(self):
         def sqr(x):
             return x * x
+
         frame = inspect.currentframe()
         co = frame.f_code
         lineno = frame.f_lineno
-        self.assertTrue(Mcode.stmt_contains_opcode(co, lineno-4,
-                                                   'MAKE_FUNCTION'))
-        self.assertFalse(Mcode.stmt_contains_opcode(co, lineno,
-                                                    'MAKE_FUNCTION'))
+        self.assertFalse(Mcode.stmt_contains_opcode(co, lineno, "MAKE_FUNCTION"))
         return
 
     def test_op_at_frame(self):
         frame = inspect.currentframe()
-        if IS_PYPY or PYTHON_VERSION >= 3.7:
-            call_opcode = 'CALL_METHOD'
+        if IS_PYPY or PYTHON_VERSION_TRIPLE >= (3, 7):
+            call_opcode = "CALL_METHOD"
         else:
-            call_opcode = 'CALL_FUNCTION'
+            call_opcode = "CALL_FUNCTION"
 
         self.assertEqual(call_opcode, Mcode.op_at_frame(frame))
         return
 
     def test_is_def_frame(self):
         # Not a "def" statement because frame is wrong spot
         frame = inspect.currentframe()
-        self.assertFalse(Mcode.is_def_stmt('foo(): pass', frame))
+        self.assertFalse(Mcode.is_def_stmt("foo(): pass", frame))
         return
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     unittest.main()

trepan/lib/bytecode.py

@@ -69,10 +69,11 @@ def next_linestart(co, offset, count=1):
     return -1000
 
 
-def stmt_contains_opcode(co, lineno, query_opcode):
+def stmt_contains_opcode(co, lineno, query_opcode) -> bool:
     linestarts = dict(xdis.findlinestarts(co))
     code = co.co_code
     found_start = False
+    offset = 0
     for offset, start_line in list(linestarts.items()):
         if start_line == lineno:
             found_start = True