  
  # django.views.generic.View (Django >= 1.3)
  try:
      from django.views.generic import View
  except:
      from django import http
      from django.utils.functional import update_wrapper
      # from django.utils.log import getLogger
      # from django.utils.decorators import classonlymethod
      
 
</s> remove     # python <= ?
    from cgi import parse_qs </s> add  </s> remove from djangorestframework import renderers, parsers, authenticators, permissions, validators, status
 </s> add from djangorestframework import renderers, parsers, authentication, permissions, validators, status </s> remove # parse_qs 
 </s> add  </s> remove from djangorestframework.markdownwrapper import apply_markdown
from djangorestframework.description import get_name, get_description
 </s> add from djangorestframework.compat import apply_markdown
from djangorestframework.utils.description import get_name, get_description </s> remove from djangorestframework.mediatypes import MediaType
 </s> add from djangorestframework.utils.mediatypes import MediaType
except ImportError:
  
  # django.views.generic.View (Django >= 1.3)
  try:
      from django.views.generic import View
except ImportError:
      from django import http
      from django.utils.functional import update_wrapper
      # from django.utils.log import getLogger
      # from django.utils.decorators import classonlymethod
      
keep keep keep keep replace keep keep keep keep keep
 More refactoring - move various less core stuff into utils etc 
djangorestframework/compat.py