Calendar enhancements

svn: r1235

src/plugins/ReadGedcom.py

@@ -64,7 +64,7 @@ callback = None
 UNEXPECTED_EOF = "Unexpected End of File"
 
 def nocnv(s):
-    return s
+    return unicode(s)
 
 photo_types = [ "jpeg", "bmp", "pict", "pntg", "tpic", "png", "gif",
                 "jpg", "tiff", "pcx" ]
@@ -1406,8 +1406,7 @@ class GedcomParser:
                     self.gedsource = self.gedmap.get_from_source_tag(matches[2])
                     self.broken_conc = self.gedsource.get_conc()
    	    elif matches[1] == "CHAR":
-                if matches[2] == "UNICODE" or matches[2] == "UTF-8" or \
-                   matches[2] == "UTF8":
+                if matches[2] == "UNICODE" or matches[2] == "UTF-8" or matches[2] == "UTF8":
                     self.code = UNICODE
                     self.cnv = nocnv
                 elif matches[2] == "ANSEL":