Merge c83bddf into ee02d8c

invenio_files_rest/models.py

@@ -966,8 +966,8 @@ def validate_key(self, key, key_):
 
     def __repr__(self):
         """Return representation of location."""
-        return '{0}:{2}:{1}'.format(
-            self.bucket_id, self.key, self.version_id)
+        return u"{0}:{2}:{1}".format(
+            self.bucket_id, self.key, self.version_id).encode('utf-8')
 
     @hybrid_property
     def mimetype(self):

tests/test_models.py

@@ -200,12 +200,20 @@ def test_object_create(app, db, dummy_location):
         # I.e. it is considered a delete marker.
         obj3 = ObjectVersion.create(b, "deleted_obj")
 
+        # Create a new object containing key in unicode
+        obj4 = ObjectVersion.create(b, u"hellö")
+
     # Object __repr__
     assert str(obj1) == \
-        "{0}:{1}:{2}".format(obj1.bucket_id, obj1.version_id, obj1.key)
+        u"{0}:{1}:{2}".format(
+            obj1.bucket_id, obj1.version_id, obj1.key).encode('utf-8')
+
+    assert str(obj4) == \
+        u"{0}:{1}:{2}".format(
+            obj4.bucket_id, obj4.version_id, obj4.key).encode('utf-8')
 
     # Sanity check
-    assert ObjectVersion.query.count() == 3
+    assert ObjectVersion.query.count() == 4
 
     # Assert that obj2 is the head version
     obj = ObjectVersion.get(b.id, "test", version_id=obj1.version_id)