diff --git a/test/bytecode_3.4/05_class.pyc b/test/bytecode_3.4/05_class.pyc index 7788e50c..8af6c121 100644 Binary files a/test/bytecode_3.4/05_class.pyc and b/test/bytecode_3.4/05_class.pyc differ diff --git a/test/bytecode_3.5/05_class.pyc b/test/bytecode_3.5/05_class.pyc index fd1829fc..6e7075e1 100644 Binary files a/test/bytecode_3.5/05_class.pyc and b/test/bytecode_3.5/05_class.pyc differ diff --git a/test/simple_source/def/05_class.py b/test/simple_source/def/05_class.py index 8baac7a2..7535404c 100644 --- a/test/simple_source/def/05_class.py +++ b/test/simple_source/def/05_class.py @@ -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) diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh index 4fa761a7..6f8768c1 100755 --- a/test/stdlib/runtests.sh +++ b/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 diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py index c36ec5e7..5aff6280 100644 --- a/uncompyle6/semantics/pysource.py +++ b/uncompyle6/semantics/pysource.py @@ -1630,7 +1630,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("(")