  from django.core.exceptions import ImproperlyConfigured
  from django.db import connection, transaction
  from django.test.client import FakePayload
  from django.utils import six
  from django.utils.encoding import force_text
  from django.utils.six.moves.urllib.parse import urlparse as _urlparse
  
  try:
 
</s> remove     parse_duration, unicode_repr, unicode_to_repr
 </s> add     parse_duration, unicode_repr, unicode_to_repr, get_filepathfield </s> remove         if django.VERSION < (1, 5):
            # django field doesn't have allow_folders, allow_files kwargs
            field = DjangoFilePathField(
                path, match=match, recursive=recursive, required=required
            )
        else:
            field = DjangoFilePathField(
                path, match=match, recursive=recursive, allow_files=allow_files,
                allow_folders=allow_folders, required=required
            )
 </s> add         field = get_filepathfield(
            path, match=match, recursive=recursive, allow_files=allow_files,
            allow_folders=allow_folders, required=required
        )
from django.forms import FilePathField as DjangoFilePathField
  from django.core.exceptions import ImproperlyConfigured
  from django.db import connection, transaction
from django.forms import FilePathField as DjangoFilePathField
  from django.test.client import FakePayload
  from django.utils import six
  from django.utils.encoding import force_text
  from django.utils.six.moves.urllib.parse import urlparse as _urlparse
  
  try:
keep add keep keep keep keep keep keep
 fix bugs, move version branching to compat, update ModelSerializer mapping 
rest_framework/compat.py