X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd.py;h=3c2e0dd038bb987cb6187748dc385fce67aeda07;hb=5bfe6ea88d9f0579f7d4ed471c63c342c7b6fc1b;hp=52f69370b61c4e932405eb8c170d2fb402255789;hpb=a65664bfcb76814a750b6dd6e1f38974bcee22be;p=phdru.name%2Fphdru.name.git
diff --git a/phd.py b/phd.py
index 52f6937..3c2e0dd 100644
--- a/phd.py
+++ b/phd.py
@@ -39,7 +39,7 @@ class phd(Template):
def body(self):
if hasattr(self, "body_html"):
- return self.body_html()
+ return self.body_html().encode('utf-8')
if hasattr(self, "body_text"):
return self.text2html()
if hasattr(self, "body_rst"):
@@ -101,16 +101,19 @@ class phd(Template):
800x600, 1024x800""" % {"img_name": img_name}
def wikipedia(self, query):
- return "http://en.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+ return "https://en.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
def wikipedia_ru(self, query):
- return "http://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+ return "https://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+
+ def startpage(self, query):
+ return "https://startpage.com/do/search?q=%s" % quote_string(query)
+
+ search = startpage
def nigma(self, query):
return "http://www.nigma.ru/index.php?s=%s" % quote_string(query)
- search = nigma
-
def yandex(self, query):
return "http://www.yandex.ru/yandsearch?text=%s&rpt=rad" % quote_string(query, "cp1251")
@@ -120,5 +123,8 @@ class phd(Template):
def google_ru(self, query):
return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
+ def lurkmoar(self, query):
+ return "https://lurkmore.to/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+
def quote_string(s, to_encoding="utf-8", ext_safe=''):
return urllib.quote(unicode(s, "utf-8").encode(to_encoding), '/' + ext_safe)