Merge lp:~jameinel/u1db/http-uuid-993976 into lp:u1db

[John A Meinel]

This is a quick fix for bug #993976. Basically, create_doc for all other apis generates document ids starting with "D-". This is meant to make it a bit easier to distinguish random data that we might run into. (document revisions are uuids, so are document ids, etc.)

[Eric Casteleijn (thisfred)]

review: Approve

=== modified file 'u1db/remote/http_database.py'
--- u1db/remote/http_database.py	2012-05-07 19:14:38 +0000
+++ u1db/remote/http_database.py	2012-05-09 13:24:18 +0000
@@ -87,7 +87,7 @@
 
     def create_doc(self, content, doc_id=None):
         if doc_id is None:
-            doc_id = str(uuid.uuid4())
+            doc_id = 'D-%s' % (uuid.uuid4().hex,)
         res, headers = self._request_json('PUT', ['doc', doc_id], {},
                                           content, 'application/json')
         new_doc = Document(doc_id, res['rev'], content)

=== modified file 'u1db/tests/test_http_database.py'
--- u1db/tests/test_http_database.py	2012-03-01 19:22:52 +0000
+++ u1db/tests/test_http_database.py	2012-05-09 13:24:18 +0000
@@ -137,6 +137,7 @@
     def test_create_doc_without_id(self):
         self.response_val = {'rev': 'doc-rev-2'}, {}
         new_doc = self.db.create_doc('{"v": 3}')
+        self.assertEqual('D-', new_doc.doc_id[:2])
         self.assertEqual('doc-rev-2', new_doc.rev)
         self.assertEqual('{"v": 3}', new_doc.content)
         self.assertEqual(('PUT', ['doc', new_doc.doc_id], {},