Merge branch 'master' of github.com:rocky/python-uncompyle6

admin-tools/setup-master.sh

@@ -20,3 +20,4 @@ cd $fulldir/..
     (cd ../python-xdis && git checkout master && pyenv local $PYTHON_VERSION) && git pull && \
     git checkout master && pyenv local $PYTHON_VERSION && git pull
 cd $owd
+rm -v */.python-version || true

admin-tools/setup-python-2.4.sh

@@ -14,3 +14,4 @@ cd $fulldir/..
     (cd ../python-xdis && git checkout python-2.4 && pyenv local $PYTHON_VERSION) && git pull && \
     git checkout python-2.4 &&  pyenv local $PYTHON_VERSION && git pull
 cd $owd
+rm -v */.python-version || true

test/simple_source/def/05_class.py

@@ -1,4 +1,4 @@
-# Tests:
+n# Tests:
 #   importstmt ::= LOAD_CONST LOAD_CONST import_as
 #   import_as ::= IMPORT_NAME store
 
@@ -15,3 +15,11 @@ class BZ2File(io.BufferedIOBase):
 
 class ABC(metaclass=BZ2File):
     pass
+
+# From 3.3 test_abc
+
+# Bug was class Descriptor("Descriptor"): instead of below
+def test_customdescriptors_with_abstractmethod():
+    class Descriptor:
+        def setter(self):
+            return Descriptor(self._fget)

test/stdlib/runtests.sh

@@ -26,7 +26,7 @@ FULLVERSION=$(pyenv local)
 PYVERSION=${FULLVERSION%.*}
 MINOR=${FULLVERSION##?.?.}
 
-typeset -i STOP_ONERROR=1
+STOP_ONERROR=${STOP_ONERROR:-1}
 
 typeset -A SKIP_TESTS
 case $PYVERSION in

uncompyle6/semantics/pysource.py

@@ -1636,7 +1636,7 @@ class SourceWalker(GenericASTTraversal, object):
                     pass
             pass
         else:
-            if self.version >= 3.6 and node[0] == "LOAD_CONST":
+            if node[0] == "LOAD_STR":
                 return
             value = self.traverse(node[0])
             self.write("(")