Code

Clean up compat code#2200

Code

Merged

tomchristie merged 7 commits intoencode:masterencode/django-rest-framework:masterfrom maryokhin:mastermaryokhin/django-rest-framework:masterCopy head branch name to clipboardDec 5, 2014

+90-156

Commits

Commits on Dec 3, 2014

• Updated Django versions to match requirements

  maryokhin

  committed
  f8fdfe5

  Copy full SHA for f8fdfe5

Commits on Dec 4, 2014

• Removed custom python_2_unicode_compatible. Closes encode#2183

  maryokhin

  committed
  09e59f2

  Copy full SHA for 09e59f2

• Removed custom StringIO, force_text, smart_text compat

  maryokhin

  committed
  d54c67d

  Copy full SHA for d54c67d

• Removed custom urlparse compat

  maryokhin

  committed
  95af92c

  Copy full SHA for 95af92c

• Removed unused compat code

  maryokhin

  committed
  001884a

  Copy full SHA for 001884a

• Merge branch 'master' of github.com:tomchristie/django-rest-framework

  maryokhin

  committed
  45dc44b

  Copy full SHA for 45dc44b

• Removed unused imports, pep8 fixes, typo fixes

  maryokhin

  committed
  d993018

  Copy full SHA for d993018