Merge remote-tracking branch 'origin/master' into release/3.0.3

2 files changed, 3 insertions, 3 deletions

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index b1f6f2fa..971dee9c 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -10,7 +10,7 @@ import inspect
 
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.encoding import force_text
-from django.utils.six.moves.urllib import parse as urlparse
+from django.utils.six.moves.urllib.parse import urlparse as _urlparse
 from django.conf import settings
 from django.utils import six
 import django
@@ -182,7 +182,7 @@ except ImportError:
 class RequestFactory(DjangoRequestFactory):
     def generic(self, method, path,
             data='', content_type='application/octet-stream', **extra):
-        parsed = urlparse.urlparse(path)
+        parsed = _urlparse(path)
         data = force_bytes_or_smart_bytes(data, settings.DEFAULT_CHARSET)
         r = {
             'PATH_INFO': self._get_path(parsed),
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 33f84813..fc6dfecd 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -167,7 +167,7 @@ class APISettings(object):
     For example:
 
         from rest_framework.settings import api_settings
-        print api_settings.DEFAULT_RENDERER_CLASSES
+        print(api_settings.DEFAULT_RENDERER_CLASSES)
 
     Any setting with string import paths will be automatically resolved
     and return the class, rather than the string literal.