          return user.is_active
  
      def check_nonce(self, request, oauth_request):
          """Checks nonce of request"""
          return store.check_nonce(request, oauth_request, oauth_request['oauth_nonce'])
 
</s> remove                 request.user = token.user
                return (request.user, None)
 </s> add                 return (token.user, token) </s> remove         :returns: two-tuple of (user, auth) if authentication succeeds, or None otherwise.
 </s> add         Returns two-tuple of (user, auth token) if authentication succeeds, or None otherwise. </s> remove     django-oath-plus"""
 </s> add     django-oath-plus and oauth2""" </s> remove         if oauth2 is None:
            raise ImproperlyConfigured("The 'python-oauth2' package could not be imported. It is required for use with the 'OAuthAuthentication' class.")
 </s> add         if oauth is None:
            raise ImproperlyConfigured("The 'oauth2' package could not be imported. It is required for use with the 'OAuthAuthentication' class.") </s> remove             except oauth2.Error, e:
                print "got e"
 </s> add             except oauth.Error, e:
        return oauth_provider.store.store.check_nonce(request, oauth_request, oauth_request['oauth_nonce'])
          return user.is_active
  
      def check_nonce(self, request, oauth_request):
          """Checks nonce of request"""
        return oauth_provider.store.store.check_nonce(request, oauth_request, oauth_request['oauth_nonce'])
keep keep keep keep replace
 Move oauth2 and django-oauth-plus imports to compat and fix some minor issues

- alias oauth2 as oauth
- remove rouge print
- remove docstring markups
- OAuthAuthentication.authenticate() now returns (user, token) two-tuple on success
- don't set request.user because it's already set 
rest_framework/authentication.py