From f1900bbea6d7402fb511d84d2b1e58e17b59a03d Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 18 Feb 2017 10:34:41 -0200
Subject: [PATCH] Revert subclassing explicitly from object introduced by
 accident in #2260

---
 _pytest/vendored_packages/pluggy.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/_pytest/vendored_packages/pluggy.py b/_pytest/vendored_packages/pluggy.py
index 11658c3b149..9c13932b364 100644
--- a/_pytest/vendored_packages/pluggy.py
+++ b/_pytest/vendored_packages/pluggy.py
@@ -75,7 +75,7 @@
 _py3 = sys.version_info > (3, 0)
 
 
-class HookspecMarker(object):
+class HookspecMarker:
     """ Decorator helper class for marking functions as hook specifications.
 
     You can instantiate it with a project_name to get a decorator.
@@ -113,7 +113,7 @@ def setattr_hookspec_opts(func):
             return setattr_hookspec_opts
 
 
-class HookimplMarker(object):
+class HookimplMarker:
     """ Decorator helper class for marking functions as hook implementations.
 
     You can instantiate with a project_name to get a decorator.
@@ -167,7 +167,7 @@ def normalize_hookimpl_opts(opts):
     opts.setdefault("optionalhook", False)
 
 
-class _TagTracer(object):
+class _TagTracer:
     def __init__(self):
         self._tag2proc = {}
         self.writer = None
@@ -214,7 +214,7 @@ def setprocessor(self, tags, processor):
         self._tag2proc[tags] = processor
 
 
-class _TagTracerSub(object):
+class _TagTracerSub:
     def __init__(self, root, tags):
         self.root = root
         self.tags = tags
@@ -254,7 +254,7 @@ def _wrapped_call(wrap_controller, func):
     return call_outcome.get_result()
 
 
-class _CallOutcome(object):
+class _CallOutcome:
     """ Outcome of a function call, either an exception or a proper result.
     Calling the ``get_result`` method will return the result or reraise
     the exception raised when the function was called. """
@@ -286,7 +286,7 @@ def _reraise(cls, val, tb):
 """)
 
 
-class _TracedHookExecution(object):
+class _TracedHookExecution:
     def __init__(self, pluginmanager, before, after):
         self.pluginmanager = pluginmanager
         self.before = before
@@ -580,7 +580,7 @@ def subset_hook_caller(self, name, remove_plugins):
         return orig
 
 
-class _MultiCall(object):
+class _MultiCall:
     """ execute a call into multiple python functions/methods. """
 
     # XXX note that the __multicall__ argument is supported only
@@ -673,7 +673,7 @@ def varnames(func, startindex=None):
     return x
 
 
-class _HookRelay(object):
+class _HookRelay:
     """ hook holder object for performing 1:N hook calls where N is the number
     of registered plugins.
 
@@ -770,7 +770,7 @@ def _maybe_apply_history(self, method):
                     proc(res[0])
 
 
-class HookImpl(object):
+class HookImpl:
     def __init__(self, plugin, plugin_name, function, hook_impl_opts):
         self.function = function
         self.argnames = varnames(self.function)