From 04545f8a54c6a5e8e11932f4a045fb2f51a52013 Mon Sep 17 00:00:00 2001
From: Michael Aquilina <michaelaquilina@gmail.com>
Date: Thu, 1 Oct 2015 21:55:51 +0100
Subject: [PATCH] classes inherit from object

---
 _pytest/skipping.py      | 2 +-
 testing/test_skipping.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_pytest/skipping.py b/_pytest/skipping.py
index 2733cac16..93faa4c9b 100644
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -51,7 +51,7 @@ def xfail(reason=""):
     raise XFailed(reason)
 xfail.Exception = XFailed
 
-class MarkEvaluator:
+class MarkEvaluator(object):
     def __init__(self, item, name):
         self.item = item
         self.name = name
diff --git a/testing/test_skipping.py b/testing/test_skipping.py
index b0d3beff3..d7ceb5cfc 100644
--- a/testing/test_skipping.py
+++ b/testing/test_skipping.py
@@ -4,7 +4,7 @@ import sys
 from _pytest.skipping import MarkEvaluator, folded_skips, pytest_runtest_setup
 from _pytest.runner import runtestprotocol
 
-class TestEvaluator:
+class TestEvaluator(object):
     def test_no_marker(self, testdir):
         item = testdir.getitem("def test_func(): pass")
         evalskipif = MarkEvaluator(item, 'skipif')
@@ -125,7 +125,7 @@ class TestEvaluator:
         assert expl == "condition: config._hackxyz"
 
 
-class TestXFail:
+class TestXFail(object):
     def test_xfail_simple(self, testdir):
         item = testdir.getitem("""
             import pytest
@@ -350,7 +350,7 @@ class TestXFail:
         ])
 
 
-class TestXFailwithSetupTeardown:
+class TestXFailwithSetupTeardown(object):
     def test_failing_setup_issue9(self, testdir):
         testdir.makepyfile("""
             import pytest