diff -r a2cfea193040 -r ac865f020b99 tests/test-extensions-wrapfunction.py
--- a/tests/test-extensions-wrapfunction.py	Fri Apr 27 13:15:51 2018 -0400
+++ b/tests/test-extensions-wrapfunction.py	Fri Apr 27 13:39:45 2018 -0400
@@ -35,7 +35,7 @@
         print('unwrap %s: %s: %s' % (getid(w), getid(result), msg))
 
 batchwrap(wrappers + [wrappers[0]])
-batchunwrap([(wrappers[i] if i >= 0 else None)
+batchunwrap([(wrappers[i] if i is not None and i >= 0 else None)
              for i in [3, None, 0, 4, 0, 2, 1, None]])
 
 wrap0 = extensions.wrappedfunction(dummy, 'getstack', wrappers[0])