CLN: remove unneeded inheritance from base object (pandas-dev#26128)

Author: ryanreh99

asv_bench/benchmarks/io/csv.py

@@ -50,6 +50,7 @@ def time_frame_date_formatting(self):
         self.data.to_csv(self.fname, date_format='%Y%m%d')
 
 
+<<<<<<< HEAD
 class ToCSVDatetimeBig(BaseIO):
 
     fname = '__test__.csv'
@@ -68,6 +69,8 @@ def time_frame(self, obs):
         self.data.to_csv(self.fname)
 
 
+=======
+>>>>>>> c18c8be77... CLN: remove unneeded inheritance from base object (#26128)
 class StringIORewind:
 
     def data(self, stringio_object):

pandas/core/accessor.py

@@ -12,7 +12,11 @@
 
 
 class DirNamesMixin:
+<<<<<<< HEAD
     _accessors = set()  # type: Set[str]
+=======
+    _accessors = frozenset()
+>>>>>>> c18c8be77... CLN: remove unneeded inheritance from base object (#26128)
     _deprecations = frozenset(
         ['asobject', 'base', 'data', 'flags', 'itemsize', 'strides'])
 

pandas/io/excel/_base.py

@@ -327,7 +327,12 @@ def read_excel(io,
         **kwds)
 
 
+<<<<<<< HEAD
 class _BaseExcelReader(metaclass=abc.ABCMeta):
+=======
+@add_metaclass(abc.ABCMeta)
+class _BaseExcelReader:
+>>>>>>> c18c8be77... CLN: remove unneeded inheritance from base object (#26128)
 
     @property
     @abc.abstractmethod
@@ -485,7 +490,12 @@ def parse(self,
             return output[asheetname]
 
 
+<<<<<<< HEAD
 class ExcelWriter(metaclass=abc.ABCMeta):
+=======
+@add_metaclass(abc.ABCMeta)
+class ExcelWriter:
+>>>>>>> c18c8be77... CLN: remove unneeded inheritance from base object (#26128)
     """
     Class for writing DataFrame objects into excel sheets, default is to use
     xlwt for xls, openpyxl for xlsx.  See DataFrame.to_excel for typical usage.

pandas/tseries/holiday.py

@@ -323,7 +323,12 @@ def __new__(cls, clsname, bases, attrs):
         return calendar_class
 
 
+<<<<<<< HEAD
 class AbstractHolidayCalendar(metaclass=HolidayCalendarMetaClass):
+=======
+@add_metaclass(HolidayCalendarMetaClass)
+class AbstractHolidayCalendar:
+>>>>>>> c18c8be77... CLN: remove unneeded inheritance from base object (#26128)
     """
     Abstract interface to create holidays following certain rules.
     """