alexmojaki · alexmojaki · Oct 6, 2024 · Oct 6, 2024 · Oct 6, 2024 · Oct 6, 2024
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -2,16 +2,17 @@ name: Tests
 on: [push, pull_request]
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10', 3.11-dev, 'pypy-2.7', 'pypy-3.6']
+        python-version: [3.8, 3.9, '3.10', 3.11, 3.12, 3.13]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
     - name: run tests
       run: |
         pip install --upgrade pip

diff --git a/snoop/formatting.py b/snoop/formatting.py
@@ -169,7 +169,7 @@ def opname(self):
     def is_yield_value(self):
         for i in range(self.frame.f_lasti, -1, -1):
             opname = self.opname_at(i)
-            if opname not in ('RESUME', 'CACHE'):
+            if opname not in ('RESUME', 'CACHE', 'POP_TOP', 'PUSH_NULL'):
                 return opname == 'YIELD_VALUE'
 
 
@@ -303,15 +303,15 @@ def format_return(self, event):
                 if event.frame_info.had_exception:
                     return [u'{c.red}??? Call either returned None or ended by exception{c.reset}'
                                 .format(c=self.c)]
-            elif opname not in ('RETURN_VALUE', 'YIELD_VALUE'):
+            elif opname not in ('RETURN_VALUE', 'YIELD_VALUE', 'RETURN_CONST'):
                 return [u'{c.red}!!! Call ended by exception{c.reset}'.format(c=self.c)]
 
         value = self.highlighted(my_cheap_repr(arg))
         if event.comprehension_type:
             prefix = plain_prefix = u'Result: '
         else:
             plain_prefix = u'<<< {description} value from {func}: '.format(
-                description='Yield' if opname == 'YIELD_VALUE' else 'Return',
+                description='Yield' if opname in ('YIELD_VALUE', 'RESUME') else 'Return',
                 func=event.code_qualname(),
             )
             prefix = u'{c.green}{}{c.reset}'.format(

diff --git a/tests/sample_results/2.7/color.txt b/tests/sample_results/2.7/color.txt
diff --git a/tests/sample_results/2.7/comprehensions.txt b/tests/sample_results/2.7/comprehensions.txt
diff --git a/tests/sample_results/2.7/decorator_exception.txt b/tests/sample_results/2.7/decorator_exception.txt
diff --git a/tests/sample_results/2.7/pp_custom_pformat.txt b/tests/sample_results/2.7/pp_custom_pformat.txt