Adapted to CheetahTemplate 2.4+ - it's all unicode internally

[phdru.name/phdru.name.git] / phd.py

diff --git a/phd.py b/phd.py
index e12fb902cb88599af9dfc49a13a361df6c4d9f0d..ed53e83ab5d2ef4acaed3fde5b86e6e4d7321b7c 100644 (file)
--- 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('/')) + 1
+full_dirs = len(os.getcwd().split('/')) + 2
 
 class phd(Template):
    def __init__(self, *args, **kw):
@@ -109,4 +109,4 @@ class phd(Template):
       return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
 
 def quote_string(s, to_encoding="utf-8", ext_safe=''):
-   return urllib.quote(unicode(s, "koi8-r").encode(to_encoding), '/' + ext_safe)
+   return urllib.quote(unicode(s, "utf-8").encode(to_encoding), '/' + ext_safe)