  from django.conf import settings
  from django.contrib.auth import REDIRECT_FIELD_NAME
  from django.core.exceptions import PermissionDenied
  from django.shortcuts import resolve_url
  from django.utils import six
  from django.utils.decorators import available_attrs
  from django.utils.six.moves.urllib.parse import urlparse
  
  
  def user_passes_test(test_func, login_url=None, redirect_field_name=REDIRECT_FIELD_NAME):
 
</s> remove from django.utils import six
 </s> add  </s> remove from django.utils import six
 </s> add  </s> remove from django.utils import six, timezone
 </s> add from django.utils import timezone </s> remove from django.utils import lru_cache, six
 </s> add from django.utils import lru_cache </s> remove from django.utils import six
 </s> add 
  from django.conf import settings
  from django.contrib.auth import REDIRECT_FIELD_NAME
  from django.core.exceptions import PermissionDenied
  from django.shortcuts import resolve_url

  from django.utils.decorators import available_attrs
  from django.utils.six.moves.urllib.parse import urlparse
  
  
  def user_passes_test(test_func, login_url=None, redirect_field_name=REDIRECT_FIELD_NAME):
keep keep keep keep replace keep keep keep keep keep
 Refs #23919 -- Removed six.<various>_types usage

Thanks Tim Graham and Simon Charette for the reviews. 
django/contrib/auth/decorators.py