Change abstract classes to use six

Change-Id: Iaa708cd89ddae0fb87812d30ae65e6c7ccb18969