Use UTF-8 when importing files to avoid mojobake

diff --git a/calypso/webdav.py b/calypso/webdav.py
index 4db857536f2e79f2daf8376ffda5d912770a8a43..2d87349aae970700cd846ff1e720b41afef6ccc6 100644 (file)
--- a/calypso/webdav.py
+++ b/calypso/webdav.py
@@ -519,10 +519,10 @@ class Collection(object):
                         if ve.contents.has_key('dtstart') and ve.contents.has_key('duration'):
                             del ve.contents['duration']
                         new_ics.vevent_list = [ve]
-                        new_item = Item(new_ics.serialize(), None, path)
+                        new_item = Item(new_ics.serialize().decode('utf-8'), None, path)
                         self.import_item(new_item, path)
                 else:
-                    new_item = Item(new_ics.serialize(), None, path)
+                    new_item = Item(new_ics.serialize().decode('utf-8'), None, path)
                     self.import_item(new_item, path)
             return True
         except Exception, ex:

diff --git a/tests/data/import.vcard b/tests/data/import.vcard
index b9d2c5f0a38046cd503b3f817037bdff9eba54dd..d91240e9c6e98844eb26c57880acd4dba1af4417 100644 (file)
--- a/tests/data/import.vcard
+++ b/tests/data/import.vcard
@@ -1,3 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+N:TromsøUniversitetet;i;;
+FN:Universitetet i Tromsø
+ORG:Universitetet i Tromsø
+TEL;TYPE=WORK:+47 77 64 40 00
+END:VCARD
+
 BEGIN:VCARD
 VERSION:4.0
 N:Gump;Forrest;;;

diff --git a/tests/test_collection.py b/tests/test_collection.py
index 8e80faf60548f8c0f8464875fcdd45be1bde6cf4..feda9a0872a80ac737724ca158b0563738f0f97f 100644 (file)
--- a/tests/test_collection.py
+++ b/tests/test_collection.py
@@ -26,4 +26,6 @@ class TestCollection(unittest.TestCase):
     def test_import_file(self):
         collection = Collection("")
         self.assertTrue(collection.import_file(self.test_vcard))
-        self.assertEqual(len(collection.items), 1)
+        self.assertEqual(len(collection.items), 2)
+        org = u'Universitetet i Tromsø'
+        self.assertTrue(org == collection.items[0].object.org.value[0])