Merge lp:~canonical-isd-hackers/canonical-identity-provider/login-unicode-error into lp:canonical-identity-provider/release

[Szilveszter Farkas]

[Ricardo Kirkner (ricardokirkner)]

looks ok.

review: Approve

[Anthony Lenton (elachuni)]

In general when using non-ascii character literals in code it's better to use unicodes instead of regular strings, even if you need encoded strings.

So, u'test客'.encode('utf-8') is better than 'test客' even in a utf-8 encoded file:
- If you ever need to transcode your files to something else, you'll then just need to update the file header and everything keeps working, instead of having to change all your string literals.
- Explicit is better than implicit -- in the first case you know the encoding instantly, otherwise you have to go up and look at the file header.

review: Approve

=== modified file 'identityprovider/decorators.py'
--- identityprovider/decorators.py	2010-04-21 15:29:24 +0000
+++ identityprovider/decorators.py	2010-05-07 16:08:26 +0000
@@ -148,7 +148,7 @@
         # IP address and key_field (if it is set)
         extra = super(ratelimit_post, self).key_extra(request)
         if self.key_field:
-            value = sha1(request.POST.get(self.key_field, '')).hexdigest()
+            value = sha1(request.POST.get(self.key_field, '').encode('utf-8')).hexdigest()
             extra += '-' + value
         return extra
 

=== modified file 'identityprovider/tests/test_views_ui.py'
--- identityprovider/tests/test_views_ui.py	2010-04-21 15:29:24 +0000
+++ identityprovider/tests/test_views_ui.py	2010-05-07 16:08:26 +0000
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -42,6 +43,24 @@
     def authenticate(self):
         self.client.login(username='[e-mail]', password='test')
 
+    def test_login_with_unicode_email(self):
+        r = self.client.post(
+            '/+login',
+            {
+                'email': u'mark@客example.com'.encode('utf-8'),
+                'password': 'test',
+            })
+        self.assertFormError(r, 'form', 'email', 'Invalid email.')
+
+    def test_login_with_unicode_password(self):
+        r = self.client.post(
+            '/+login',
+            {
+                'email': '[e-mail]',
+                'password': u'test客'.encode('utf-8'),
+            })
+        self.assertFormError(r, 'form', None, 'Password didn\'t match.')
+
     def test_login_with_next(self):
         r = self.client.post('/+login', {'email': '[e-mail]',
                                          'password': 'test',

=== modified file 'setup.py'
--- setup.py	2010-04-23 15:38:18 +0000
+++ setup.py	2010-05-07 16:08:26 +0000
@@ -47,21 +47,6 @@
 
     zip_safe=False,
 
-    install_requires=[
-        "django==1.0.2-final",
-        "simplejson==2.0.0",
-        "lazr.restful==0.9.17",
-        "python-openid",
-        "oauth",
-        "psycopg2==2.0.14",
-        "python-memcached",
-        "zope.testbrowser",
-        "coverage",
-        "beautifulsoup",
-        "lazr.authentication",
-        "lazr.restfulclient==0.9.10",
-    ],
-
     data_files=data_files,
     package_data={
         'identityprovider.webservice': ['site.zcml'],