Permalink
Browse files

merge stepler and varche1

  • Loading branch information...
2 parents 713b27c + f361fe0 commit 73e12fdd7c731c4d601b55e49cd2c923987ed20e @stepler stepler committed Jun 19, 2012
Showing with 5,790 additions and 550 deletions.
  1. +191 −141 argparser.py
  2. +3 −0 editor.py
  3. +166 −176 geeknote.py
  4. +427 −0 lib/markdown/__init__.py
  5. +87 −0 lib/markdown/__main__.py
  6. +97 −0 lib/markdown/blockparser.py
  7. +553 −0 lib/markdown/blockprocessors.py
  8. +31 −0 lib/markdown/etree_loader.py
  9. +51 −0 lib/markdown/extensions/__init__.py
  10. +96 −0 lib/markdown/extensions/abbr.py
  11. +128 −0 lib/markdown/extensions/attr_list.py
  12. +226 −0 lib/markdown/extensions/codehilite.py
  13. +110 −0 lib/markdown/extensions/def_list.py
  14. +52 −0 lib/markdown/extensions/extra.py
  15. +165 −0 lib/markdown/extensions/fenced_code.py
  16. +299 −0 lib/markdown/extensions/footnotes.py
  17. +201 −0 lib/markdown/extensions/headerid.py
  18. +69 −0 lib/markdown/extensions/html_tidy.py
  19. +96 −0 lib/markdown/extensions/meta.py
  20. +36 −0 lib/markdown/extensions/nl2br.py
  21. +114 −0 lib/markdown/extensions/rss.py
  22. +45 −0 lib/markdown/extensions/smart_strong.py
  23. +98 −0 lib/markdown/extensions/tables.py
  24. +154 −0 lib/markdown/extensions/toc.py
  25. +155 −0 lib/markdown/extensions/wikilinks.py
  26. +458 −0 lib/markdown/inlinepatterns.py
  27. +162 −0 lib/markdown/odict.py
  28. +101 −0 lib/markdown/postprocessors.py
  29. +282 −0 lib/markdown/preprocessors.py
  30. +275 −0 lib/markdown/serializers.py
  31. +359 −0 lib/markdown/treeprocessors.py
  32. +114 −0 lib/markdown/util.py
  33. +2 −1 log.py
  34. +21 −25 oauth.py
  35. +200 −200 io.py → out.py
  36. +2 −6 storage.py
  37. +21 −0 test.py
  38. +10 −0 tmp.py
  39. +9 −1 tools.py
  40. 0 unit/__init__.py
  41. +61 −0 unit/argparserTest.py
  42. +63 −0 unit/geeknoteTest.py
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -18,6 +18,9 @@ def textToENML(content):
"""
Create an ENML format of note.
"""
+ if not isinstance(content, str):
+ content = ""
+
content = unicode(content,"utf-8")
contentENML = markdown.markdown(content).encode("utf-8")
Oops, something went wrong.

0 comments on commit 73e12fd

Please sign in to comment.