List years in reverse order.

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

diff --git a/phd_pp.py b/phd_pp.py
index 80331b05c91025397253bc5cb3e8467592931deb..d4b2e3211747d7ba54f11aecfa50c7cfc4e9ce52 100644 (file)
--- a/phd_pp.py
+++ b/phd_pp.py
@@ -1,12 +1,14 @@
 import os, re, time, urllib
 from Cheetah.Template import Template
 
+
 url_re = r"(((https?|ftp|gopher|telnet)://|(mailto|file|news|about|ed2k|irc|sip|magnet):)[^' \t<>\"]+|(www|web|w3)[A-Za-z0-9_-]*\.[A-Za-z0-9._-]+\.[^' \t<>\"]+)[A-Za-z0-9/]"
 
 def _url2href(match):
    url = match.group(0)
    return '<a href="%s">%s</a>' % (url, url)
 
+
 full_dirs = len(os.getcwd().split('/')) + 1
 
 class phd_pp(Template):
@@ -34,6 +36,7 @@ class phd_pp(Template):
          return "%s, %s" % (start_year, this_year)
       return "%s-%s" % (start_year, this_year)
 
+
    def body(self):
       if hasattr(self, "body_html"):
          return self.body_html()
@@ -63,8 +66,7 @@ class phd_pp(Template):
 
    def rst2html(self):
       from docutils.core import publish_parts
-      from locale import getpreferredencoding
-      encoding = getpreferredencoding()
+      from m_lib.defenc import default_encoding as encoding
 
       parts = publish_parts(self.body_rst(), writer_name="html")
 
@@ -80,25 +82,31 @@ class phd_pp(Template):
       parts = [part for part in (title, subtitle, body) if part]
       return "\n\n".join(parts)
 
+
    def img_thumbnail_800_1024(self, img_name):
       return """\
 <img src="%(img_name)s-thumbnail.jpg" alt="%(img_name)s-thumbnail.jpg" /><br />
 <a href="%(img_name)s-800x600.jpg">800x600</a>, <a href="%(img_name)s-1024x800.jpg">1024x800</a>""" % {"img_name": img_name}
 
-   def google(self, query):
-      return "http://www.google.com/search?hl=en&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
+   def wikipedia(self, query):
+      return "http://en.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
 
-   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 wikipedia_ru(self, query):
+      return "http://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+
+   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")
 
-   def wikipedia(self, query):
-      return "http://en.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+   def google(self, query):
+      return "http://www.google.com/search?hl=en&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
 
-   def wikipedia_ru(self, query):
-      return "http://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+   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 quote_string(s, to_encoding="utf-8", ext_safe=''):
    return urllib.quote(unicode(s, "koi8-r").encode(to_encoding), '/' + ext_safe)