X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd.py;h=d1821b1abcc93beed7d6b5bcdedccbacc2c623a3;hb=7dc98fde48ae7cdb612f9217d54fb62675883606;hp=f34437a9af1b647e5f3078f6978a0c14bd91ac67;hpb=c978d4eac730a7fa0d578c4946fcc88854ba8aef;p=phdru.name%2Fphdru.name.git

diff --git a/phd.py b/phd.py
index f34437a..d1821b1 100644
--- a/phd.py
+++ b/phd.py
@@ -9,7 +9,7 @@ def _url2href(match):
    return '<a href="%s">%s</a>' % (url, url)
 
 
-full_dirs = len(os.getcwd().split('/')) + 2
+full_dirs = len(os.getcwd().split('/')) + 1
 
 class phd(Template):
    def __init__(self, *args, **kw):
@@ -80,7 +80,13 @@ class phd(Template):
          subtitle = "<h2>%s</h2>" % subtitle
 
       body = parts["body"]
-      parts = [part for part in (title, subtitle, body) if part]
+      parts = []
+      for part in (title, subtitle, body):
+          if not part:
+              continue
+          if isinstance(part, unicode):
+              part = part.encode('utf-8')
+          parts.append(part)
       return "\n\n".join(parts)
 
    def mkd2html(self):