  
  @register.simple_tag
  def simple_only_unlimited_args(*args):
      """Expected simple_only_unlimited_args __doc__"""
      return "simple_only_unlimited_args - Expected result: %s" % ', '.join(six.text_type(arg) for arg in args)
  
  
  simple_only_unlimited_args.anything = "Expected simple_only_unlimited_args __dict__"
  
  
 
</s> remove             ', '.join(six.text_type(arg) for arg in args)
 </s> add             ', '.join(str(arg) for arg in args) </s> remove             ', '.join(six.text_type(arg) for arg in args)
 </s> add             ', '.join(str(arg) for arg in args) </s> remove         ', '.join(six.text_type(arg) for arg in [one, two] + list(args))
 </s> add         ', '.join(str(arg) for arg in [one, two] + list(args)) </s> remove                 ', '.join(six.text_type(arg) for arg in [one, two] + list(args))
 </s> add                 ', '.join(str(arg) for arg in [one, two] + list(args)) </s> remove                 ', '.join(six.text_type(arg) for arg in [one, two] + list(args))
 </s> add                 ', '.join(str(arg) for arg in [one, two] + list(args))
    return "simple_only_unlimited_args - Expected result: %s" % ', '.join(str(arg) for arg in args)
  
  @register.simple_tag
  def simple_only_unlimited_args(*args):
      """Expected simple_only_unlimited_args __doc__"""
    return "simple_only_unlimited_args - Expected result: %s" % ', '.join(str(arg) for arg in args)
  
  
  simple_only_unlimited_args.anything = "Expected simple_only_unlimited_args __dict__"
  
  
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. 
tests/template_tests/templatetags/custom.py