diff options
Diffstat (limited to 'chimere/views.py')
| -rw-r--r-- | chimere/views.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/chimere/views.py b/chimere/views.py index 8d32270..eab700e 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -23,20 +23,20 @@ Views of the project import datetime from itertools import groupby +import json import re from django.conf import settings from django.contrib.gis.geos import GEOSGeometry, Polygon as GEOSPolygon from django.contrib.gis.gdal.error import OGRException from django.contrib.gis.measure import D -from django.contrib.sites.models import get_current_site +from django.contrib.sites.shortcuts import get_current_site from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse from django.db.models import Q from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.shortcuts import get_object_or_404, redirect, render_to_response from django.template import RequestContext, defaultfilters -from django.utils import simplejson as json from django.utils.http import urlquote from django.utils.translation import ugettext as _ from django.views.generic import TemplateView, ListView @@ -134,8 +134,8 @@ def getShareNetwork(request, area_name='', marker=None): """ parameters = "" if marker: - parameters = u'current_feature=%d' % marker.pk - parameters += u"&checked_categories=%s" % "_".join( + parameters = 'current_feature=%d' % marker.pk + parameters += "&checked_categories=%s" % "_".join( [str(m.id) for m in marker.categories.all()]) net_dct = getTinyfiedUrl(request, parameters, area_name) share_networks = [] @@ -237,7 +237,7 @@ def get_edit_page(redirect_url, item_cls, item_form, if subcategories: for cat, subcats in subcategories: listed_subcats.append( - (unicode(cat), + (str(cat), [(subcat.pk, subcat.name) for subcat in subcats])) # if an item_id is provided: modification init_item, ref_item = None, None @@ -319,8 +319,8 @@ def get_edit_page(redirect_url, item_cls, item_form, item.ref_item.pk, 'submited'), None, subcategories else: response_dct['error_message'] = _( - u"There are missing field(s)" - u" and/or errors in the submited form.") + "There are missing field(s)" + " and/or errors in the submited form.") else: form = item_form(instance=init_item, subcategories=listed_subcats, area_name=area_name) @@ -360,7 +360,7 @@ def uploadFile(request, category_id='', area_name=''): if category_id: try: category = SubCategory.objects.get(pk=category_id) - response_dct['category'] = unicode(category) + response_dct['category'] = str(category) except: pass # If the form has been submited @@ -382,7 +382,7 @@ def uploadFile(request, category_id='', area_name=''): routefile.process() if not routefile.route: response_dct['errors'] = _( - u"Bad file. Please check it with an external software.") + "Bad file. Please check it with an external software.") response_dct.update({'form': form}) return render_to_response( 'chimere/upload_file.html', response_dct, @@ -528,14 +528,14 @@ def contactus(request, area_name=""): # All validation rules pass if form.is_valid(): response = notifyStaff( - _(u"Comments/request on the map"), + _("Comments/request on the map"), form.cleaned_data['content'], form.cleaned_data['email']) if response: - msg = _(u"Thank you for your contribution. It will be taken " - u"into account. If you have left your email you may " - u"be contacted soon for more details.") + msg = _("Thank you for your contribution. It will be taken " + "into account. If you have left your email you may " + "be contacted soon for more details.") else: - msg = _(u"Temporary error. Renew your message later.") + msg = _("Temporary error. Renew your message later.") else: form = ContactForm() response_dct, redir = get_base_response(request, area_name) @@ -784,7 +784,7 @@ def getGeoObjects(request, area_name, category_ids, status): if not status: status = 'A' status = status.split('_') - category_ids = unicode(category_ids).split('_') + category_ids = str(category_ids).split('_') bounding_box = [] for attr in ['min_lon', 'min_lat', 'max_lon', 'max_lat']: @@ -919,7 +919,7 @@ def getTinyfiedUrl(request, parameters, area_name=''): for item in parameters.split('&'): if 'current_feature' in item: try: - text = unicode(Marker.objects.get(id=item.split('=')[1])) + text = str(Marker.objects.get(id=item.split('=')[1])) except (IndexError, Marker.DoesNotExist): pass data["urn"] = urlquote(urn) @@ -995,7 +995,7 @@ class CategoryView(TemplateView): raise Http404(_("Category does not exist")) items, zoom_need_reload = _getGeoObjects( - self.area_name, [unicode(self.category.pk)], getjson=False, + self.area_name, [str(self.category.pk)], getjson=False, item_types=('Marker',)) return items @@ -1033,9 +1033,9 @@ def route(request, area_name, lon1, lat1, lonlat_steps, lon2, lat2, if transport not in dict(settings.CHIMERE_ROUTING_TRANSPORT): transport = settings.CHIMERE_ROUTING_TRANSPORT[0][0] if speed: - speed = unicode(speed) + speed = str(speed) available_speed = [ - unicode(sp) + str(sp) for sp, lbl in settings.CHIMERE_ROUTING_SPEEDS[transport]] if speed not in available_speed: speed = None @@ -1054,7 +1054,7 @@ def route(request, area_name, lon1, lat1, lonlat_steps, lon2, lat2, try: route = GEOSGeometry(jsons[0]) except OGRException: - return HttpResponse(_(u"Bad geometry"), status=500) + return HttpResponse(_("Bad geometry"), status=500) cats = SubCategory.objects.filter(routing_warn=True) message = '' if cats.count(): |