Ticket #9316: databrowse-encode-strings.diff

django/contrib/databrowse/datastructures.py

@@ -3 +3 @@
 convenience functionality and permalink functions for the databrowse app.
 """
 
+from django.contrib.databrowse.util import quote, unquote
 from django.db import models
+from django.db.models.query import QuerySet
 from django.utils import formats
 from django.utils.text import capfirst
-from django.utils.encoding import smart_unicode, smart_str, iri_to_uri
+from django.utils.encoding import smart_unicode, smart_str
 from django.utils.safestring import mark_safe
-from django.db.models.query import QuerySet
+
 
 EMPTY_VALUE = '(None)'
 DISPLAY_SIZE = 100
 
+
 class EasyModel(object):
     def __init__(self, site, model):
         self.site = site
@@ -56 +59 @@
     def fields(self):
         return [EasyField(self, f) for f in (self.model._meta.fields + self.model._meta.many_to_many)]
 
+
 class EasyField(object):
     def __init__(self, easy_model, field):
         self.model, self.field = easy_model, field
@@ -73 +77 @@
         elif self.field.rel:
             return mark_safe('%s%s/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name))
 
+
 class EasyChoice(object):
     def __init__(self, easy_model, field, value, label):
         self.model, self.field = easy_model, field
@@ -82 +87 @@
         return smart_str(u'<EasyChoice for %s.%s>' % (self.model.model._meta.object_name, self.field.name))
 
     def url(self):
-        return mark_safe('%s%s/%s/%s/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, self.field.field.name, iri_to_uri(self.value)))
+        return mark_safe('%s%s/%s/%s/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, self.field.field.name, quote(self.value)))
+
 
 class EasyInstance(object):
     def __init__(self, easy_model, instance):
@@ -104 +110 @@
         return self.instance._get_pk_val()
 
     def url(self):
-        return mark_safe('%s%s/%s/objects/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, iri_to_uri(self.pk())))
+        return mark_safe('%s%s/%s/objects/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, quote(self.pk())))
 
     def fields(self):
         """
@@ -130 +136 @@
                 'object_list': [EasyInstance(em, i) for i in getattr(self.instance, rel_object.get_accessor_name()).all()],
             }
 
+
 class EasyInstanceField(object):
     def __init__(self, easy_model, instance, field):
         self.model, self.field, self.instance = easy_model, field, instance
@@ -184 +191 @@
             if self.field.rel.to in self.model.model_list:
                 lst = []
                 for value in self.values():
-                    url = mark_safe('%s%s/%s/objects/%s/' % (self.model.site.root_url, m.model._meta.app_label, m.model._meta.module_name, iri_to_uri(value._get_pk_val())))
+                    url = mark_safe('%s%s/%s/objects/%s/' % (self.model.site.root_url, m.model._meta.app_label, m.model._meta.module_name, quote(value._get_pk_val())))
                     lst.append((smart_unicode(value), url))
             else:
                 lst = [(value, None) for value in self.values()]
         elif self.field.choices:
             lst = []
             for value in self.values():
-                url = mark_safe('%s%s/%s/fields/%s/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, self.field.name, iri_to_uri(self.raw_value)))
+                url = mark_safe('%s%s/%s/fields/%s/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, self.field.name, quote(self.raw_value)))
                 lst.append((value, url))
         elif isinstance(self.field, models.URLField):
             val = self.values()[0]
-            lst = [(val, iri_to_uri(val))]
+            lst = [(val, quote(val))]
         else:
             lst = [(self.values()[0], None)]
         return lst
 
+
 class EasyQuerySet(QuerySet):
     """
     When creating (or cloning to) an `EasyQuerySet`, make sure to set the

django/contrib/databrowse/plugins/fieldchoices.py

@@ -2 +2 @@
 from django.db import models
 from django.contrib.databrowse.datastructures import EasyModel
 from django.contrib.databrowse.sites import DatabrowsePlugin
+from django.contrib.databrowse.util import unquote, quote
 from django.shortcuts import render_to_response
 from django.utils.text import capfirst
 from django.utils.encoding import smart_str, force_unicode
 from django.utils.safestring import mark_safe
-import urllib
+
 
 class FieldChoicePlugin(DatabrowsePlugin):
     def __init__(self, field_filter=None):
@@ -39 +40 @@
             return [mark_safe(u'%s%s/%s/%s/' % (
                 easy_instance_field.model.url(),
                 plugin_name, easy_instance_field.field.name,
-                urllib.quote(field_value, safe='')))]
+                quote(field_value)))]
 
     def model_view(self, request, model_databrowse, url):
         self.model, self.site = model_databrowse.model, model_databrowse.site
@@ -65 +66 @@
         return render_to_response('databrowse/fieldchoice_homepage.html', {'root_url': self.site.root_url, 'model': easy_model, 'field_list': field_list})
 
     def field_view(self, request, field, value=None):
+        value = unquote(value)
         easy_model = EasyModel(self.site, self.model)
         easy_field = easy_model.field(field.name)
         if value is not None:

django/contrib/databrowse/templates/databrowse/fieldchoice_list.html

@@ -1 +1 @@
 {% extends "databrowse/base_site.html" %}
+{% load databrowse %}
 
 {% block title %}{{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}{% endblock %}
 
@@ -10 +11 @@
 
 <ul class="objectlist">
 {% for object in object_list %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ object|iriencode }}/">{{ object }}</a></li>
+<li class="{% cycle 'odd' 'even' %}"><a href="{{ object|alternate_quote }}/">{{ object }}</a></li>
 {% endfor %}
 </ul>
 

django/contrib/databrowse/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from django.contrib.databrowse import views
 
 # Note: The views in this URLconf all require a 'models' argument,