gracefully format None

(cherry picked from commit dda23962d8e15f95202c1dce9efcd3aea057ed6c)

Author: Vladimir Eremeev

ftplugin/orgmode/plugins/Agenda.py

@@ -261,7 +261,7 @@ def list_timeline(cls):
         # format text of agenda
         final_agenda = []
         for i, h in enumerate(raw_agenda):
-            tmp = u"%s %s" % (h.todo, h.title)
+            tmp = fmt.format('{} {}', h.todo, h.title)
             final_agenda.append(tmp)
             cls.line2doc[len(final_agenda)] = (get_bufname(h.document.bufnr), h.document.bufnr, h.start)
 

ftplugin/orgmode/py3compat/py_py3_string.py

@@ -1,6 +1,17 @@
 import sys
+from string import Formatter
+
 
 if sys.version_info < (3,):
     VIM_PY_CALL = u':py'
 else:
     VIM_PY_CALL = u':py3'
+
+
+class NoneAsEmptyFormatter(Formatter):
+    def get_value(self, key, args, kwargs):
+        v = super().get_value(key, args, kwargs)
+        return '' if v is None else v
+
+
+fmt = NoneAsEmptyFormatter()