      """Expected inclusion_unlimited_args_kwargs __doc__"""
      # Sort the dictionary by key to guarantee the order for testing.
      sorted_kwarg = sorted(six.iteritems(kwargs), key=operator.itemgetter(0))
      return {"result": "inclusion_unlimited_args_kwargs - Expected result: %s / %s" % (
          ', '.join(six.text_type(arg) for arg in [one, two] + list(args)),
          ', '.join('%s=%s' % (k, v) for (k, v) in sorted_kwarg)
      )}
  
  
  inclusion_unlimited_args_kwargs.anything = "Expected inclusion_unlimited_args_kwargs __dict__"
 
</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)) </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     return "simple_only_unlimited_args - Expected result: %s" % ', '.join(six.text_type(arg) for arg in args)
 </s> add     return "simple_only_unlimited_args - Expected result: %s" % ', '.join(str(arg) for arg in args)
        ', '.join(str(arg) for arg in [one, two] + list(args)),
      """Expected inclusion_unlimited_args_kwargs __doc__"""
      # Sort the dictionary by key to guarantee the order for testing.
      sorted_kwarg = sorted(six.iteritems(kwargs), key=operator.itemgetter(0))
      return {"result": "inclusion_unlimited_args_kwargs - Expected result: %s / %s" % (
        ', '.join(str(arg) for arg in [one, two] + list(args)),
          ', '.join('%s=%s' % (k, v) for (k, v) in sorted_kwarg)
      )}
  
  
  inclusion_unlimited_args_kwargs.anything = "Expected inclusion_unlimited_args_kwargs __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/inclusion.py