From 25d74a591966a4aa3852cbffab0865224a9ae0e0 Mon Sep 17 00:00:00 2001
From: Michael Aquilina <michaelaquilina@gmail.com>
Date: Sat, 3 Oct 2015 16:55:04 +0100
Subject: [PATCH] Dont explicitly inherit from object

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

diff --git a/_pytest/skipping.py b/_pytest/skipping.py
index c3b7f7b77..5dbce75ed 100644
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -57,7 +57,7 @@ def xfail(reason=""):
 xfail.Exception = XFailed
 
 
-class MarkEvaluator(object):
+class MarkEvaluator:
     def __init__(self, item, name):
         self.item = item
         self.name = name
diff --git a/testing/test_skipping.py b/testing/test_skipping.py
index f9cf9354f..c72fca3c0 100644
--- a/testing/test_skipping.py
+++ b/testing/test_skipping.py
@@ -5,7 +5,7 @@ from _pytest.skipping import MarkEvaluator, folded_skips, pytest_runtest_setup
 from _pytest.runner import runtestprotocol
 
 
-class TestEvaluator(object):
+class TestEvaluator:
     def test_no_marker(self, testdir):
         item = testdir.getitem("def test_func(): pass")
         evalskipif = MarkEvaluator(item, 'skipif')
@@ -351,7 +351,7 @@ class TestXFail(object):
         ])
 
 
-class TestXFailwithSetupTeardown(object):
+class TestXFailwithSetupTeardown:
     def test_failing_setup_issue9(self, testdir):
         testdir.makepyfile("""
             import pytest
@@ -383,7 +383,7 @@ class TestXFailwithSetupTeardown(object):
         ])
 
 
-class TestSkip(object):
+class TestSkip:
     def test_skip_class(self, testdir):
         testdir.makepyfile("""
             import pytest
@@ -471,7 +471,7 @@ class TestSkip(object):
             "*1 passed*2 skipped*",
         ])
 
-class TestSkipif(object):
+class TestSkipif:
     def test_skipif_conditional(self, testdir):
         item = testdir.getitem("""
             import pytest