From aa87395c397921d3ebb465275b2f9e4bc8496a29 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 20 Apr 2016 11:18:47 +0200
Subject: [PATCH] Use py.builtin.callable

This restores compatibility with Python 3.0/3.1
---
 _pytest/_code/code.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_pytest/_code/code.py b/_pytest/_code/code.py
index 14c38da1c..feb69f9e6 100644
--- a/_pytest/_code/code.py
+++ b/_pytest/_code/code.py
@@ -235,7 +235,7 @@ class TracebackEntry(object):
             except KeyError:
                 return False
 
-        if callable(tbh):
+        if py.builtin.callable(tbh):
             return tbh(self._excinfo)
         else:
             return tbh