urllib quote_plus needs encoding strings not unicode

Author: Pierre GIRAUD

osmtm/templates/task.mako

@@ -99,14 +99,14 @@ querymiddle = ''
 userlist = []
 for step in history:
     if hasattr(step, 'user') and step.user is not None and step.user.username not in userlist:
-	stepquery = '<query type="node"><user name="%(name)s"/><bbox-query %(bbox)s/></query><query type="way"><user name="%(name)s"/><bbox-query %(bbox)s/></query><query type="relation"><user name="%(name)s"/><bbox-query %(bbox)s/></query>' % {
+	stepquery = u'<query type="node"><user name="%(name)s"/><bbox-query %(bbox)s/></query><query type="way"><user name="%(name)s"/><bbox-query %(bbox)s/></query><query type="relation"><user name="%(name)s"/><bbox-query %(bbox)s/></query>' % {
 		'name': step.user.username,
 		'bbox': 'w="%f" s="%f" e="%f" n="%f"' % bounds
 		 }
 	querymiddle = querymiddle + stepquery
 	userlist.append(step.user.username)
 query = queryprefix + querymiddle + querysuffix
-query = urllib.quote_plus(query)
+query = urllib.quote_plus(query.encode('utf8'))
 %>
 <small>
   <a href="http://overpass-turbo.eu/map.html?Q=${query}" rel="tooltip" data-original-title="${_('See the changes in this area using the overpass-turbo API.')}"><span class="glyphicon glyphicon-share-alt"></span> overpass-turbo</a>

osmtm/templates/user.mako

@@ -96,11 +96,11 @@ else:
 <%
 import urllib
 bbox = project.to_bbox()
-query = '<osm-script output="json" timeout="25"><union><query type="node"><user name="%(name)s"/><bbox-query %(bbox)s/></query><query type="way"><user name="%(name)s"/><bbox-query %(bbox)s/></query><query type="relation"><user name="%(name)s"/><bbox-query %(bbox)s/></query></union><print mode="body"/><recurse type="down"/><print mode="skeleton" order="quadtile"/></osm-script>' % {
+query = u'<osm-script output="json" timeout="25"><union><query type="node"><user name="%(name)s"/><bbox-query %(bbox)s/></query><query type="way"><user name="%(name)s"/><bbox-query %(bbox)s/></query><query type="relation"><user name="%(name)s"/><bbox-query %(bbox)s/></query></union><print mode="body"/><recurse type="down"/><print mode="skeleton" order="quadtile"/></osm-script>' % {
   'name': contributor.username,
   'bbox': 'w="%f" s="%f" e="%f" n="%f"' % bbox
 }
-query = urllib.quote_plus(query)
+query = urllib.quote_plus(query.encode('utf8'))
 %>
 <small>
   <a href="http://overpass-turbo.eu/map.html?Q=${query}" ><span class="glyphicon glyphicon-share-alt"></span> overpass-turbo</a>

osmtm/tests/__init__.py

@@ -116,6 +116,9 @@ def login_as_user1(self):
     def login_as_user2(self):
         return self.__remember(self.user2_id)
 
+    def login_as_user(self, user_id):
+        return self.__remember(user_id)
+
     def __remember(self, userid):
         from pyramid.security import remember
         from pyramid import testing

osmtm/tests/test_user.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from . import BaseTestCase
 import httpretty
 
@@ -15,7 +16,7 @@ def test_users__logged_in(self):
 
     def test_users_json(self):
         res = self.testapp.get('/users.json', status=200)
-        self.assertEqual(len(res.json), 4)
+        self.assertEqual(len(res.json), 5)
 
     def test_users_json__query(self):
         res = self.testapp.get('/users.json',
@@ -161,3 +162,40 @@ def test_user__OSM_API_failure(self):
             status=500)
 
         self.testapp.get('/user/%s' % username, status=200)
+
+    def test_user__username_with_accents(self):
+        httpretty.enable()
+
+        from osmtm.models import User, DBSession
+        import transaction
+
+        userid = 12
+        username = u'new_user_éà'
+        user = User(userid, username)
+        DBSession.add(user)
+        DBSession.flush()
+        transaction.commit()
+
+        httpretty.register_uri(
+            httpretty.GET,
+            "http://www.openstreetmap.org/api/0.6/user/%s" % userid,
+            body='<?xml version="1.0" encoding="UTF-8"?>' +
+                 '<osm> <user display_name="%s"></user></osm>' % username,
+            content_type='application/xml; charset=utf-8')
+
+        headers = self.login_as_user(userid)
+        self.testapp.get('/project/1/task/4/lock', status=200,
+                         headers=headers,
+                         xhr=True)
+        self.testapp.get('/project/1/task/4/done', status=200,
+                         headers=headers,
+                         params={
+                             'comment': 'some_comment'
+                         },
+                         xhr=True)
+
+        self.testapp.get((u'/user/%s' % username).encode('utf8'), status=200)
+
+        self.testapp.get('/project/1/task/4', status=200,
+                         headers=headers,
+                         xhr=True)