Merge lp:~chipaca/u1db/fix_get-index-keys_utf8 into lp:u1db

[John Lenton]

Make u1db-client's get-index-keys work with non-ascii key values.

Make u1db-client's get-index-keys work with non-ascii key values.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 6/6/2012 3:31 PM, John Lenton wrote:
> John Lenton has proposed merging
> lp:~chipaca/u1db/fix_get-index-keys_utf8 into lp:u1db.
>
> Requested reviews: Ubuntu One hackers (ubuntuone-hackers) Related
> bugs: Bug #1009496 in U1DB: "u1db-client get-index-keys breaks on
> non-ascii documents" https://bugs.launchpad.net/u1db/+bug/1009496
>
> For more details, see:
> https://code.launchpad.net/~chipaca/u1db/fix_get-index-keys_utf8/+merge/108940
>
> Make u1db-client's get-index-keys work with non-ascii key values.

 merge: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk/PYOwACgkQJdeBCYSNAAPyzgCeOSZgZ1o8pICN0tnDEbUCPVZ1
rlQAn0GBO2CdjnBl+VzrbF/MpFplqUI+
=ReV3
-----END PGP SIGNATURE-----

review: Approve

[Eric Casteleijn (thisfred)]

Looks good, tests pass

review: Approve

=== modified file 'u1db/commandline/client.py'
--- u1db/commandline/client.py	2012-05-31 18:51:20 +0000
+++ u1db/commandline/client.py	2012-06-06 13:30:33 +0000
@@ -402,7 +402,7 @@
         try:
             db = self._open(database, create=False)
             for i in db.get_index_keys(index):
-                self.stdout.write("%s\n" % (i,))
+                self.stdout.write("%s\n" % (i.encode('utf-8'),))
         except errors.DatabaseDoesNotExist:
             self.stderr.write("Database does not exist.\n")
         except errors.IndexDoesNotExist:

=== modified file 'u1db/tests/commandline/test_client.py'
--- u1db/tests/commandline/test_client.py	2012-05-30 21:45:09 +0000
+++ u1db/tests/commandline/test_client.py	2012-06-06 13:30:33 +0000
@@ -623,6 +623,15 @@
         self.assertEqual(cmd.stdout.getvalue(), '42\n')
         self.assertEqual(cmd.stderr.getvalue(), '')
 
+    def test_get_index_keys_nonascii(self):
+        self.db.create_index("foo", "bar")
+        self.db.create_doc('{"bar": "\u00a4"}')
+        cmd = self.make_command(client.CmdGetIndexKeys)
+        retval = cmd.run(self.db_path, "foo")
+        self.assertEqual(retval, None)
+        self.assertEqual(cmd.stdout.getvalue(), '\xc2\xa4\n')
+        self.assertEqual(cmd.stderr.getvalue(), '')
+
     def test_get_index_keys_empty(self):
         self.db.create_index("foo", "bar")
         cmd = self.make_command(client.CmdGetIndexKeys)