Yahoo refactor for base compatibility
Yahoo refactor for oauthlib