[py3] Updated urllib/urllib2/urlparse imports.

Lots of functions were moved. Use explicit imports in all cases
to keey it easy to identify where the functions come from.

1 files changed, 6 insertions, 2 deletions

diff --git a/django/contrib/databrowse/plugins/objects.py b/django/contrib/databrowse/plugins/objects.py
index 7326566655..e956f4ea67 100644
--- a/django/contrib/databrowse/plugins/objects.py
+++ b/django/contrib/databrowse/plugins/objects.py
@@ -1,14 +1,18 @@
+try:
+    from urllib.parse import urljoin
+except ImportError:     # Python 2
+    from urlparse import urljoin
+
 from django import http
 from django.contrib.databrowse.datastructures import EasyModel
 from django.contrib.databrowse.sites import DatabrowsePlugin
 from django.shortcuts import render_to_response
-import urlparse
 
 class ObjectDetailPlugin(DatabrowsePlugin):
     def model_view(self, request, model_databrowse, url):
         # If the object ID wasn't provided, redirect to the model page, which is one level up.
         if url is None:
-            return http.HttpResponseRedirect(urlparse.urljoin(request.path, '../'))
+            return http.HttpResponseRedirect(urljoin(request.path, '../'))
         easy_model = EasyModel(model_databrowse.site, model_databrowse.model)
         obj = easy_model.object_by_pk(url)
         return render_to_response('databrowse/object_detail.html', {'object': obj, 'root_url': model_databrowse.site.root_url})