X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=make-news.py;h=f6929c78302ea54093506402c87e0b6bc5d589df;hb=c1a994b2cce5060f46bb89094a49017a4dd8929a;hp=50890ec1fd9ff5526c4ed45f45903ea251c69007;hpb=74dae3c909c07fa8c1861e2645922f96fdc985aa;p=phdru.name%2Fphdru.name.git
diff --git a/make-news.py b/make-news.py
index 50890ec..f6929c7 100755
--- a/make-news.py
+++ b/make-news.py
@@ -1,12 +1,8 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
# -*- coding: koi8-r -*-
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
-__author__ = "Oleg BroytMann
-
""") @@ -51,7 +45,7 @@ elif lang == "ru": new_text.append("""\
#end def -$phd_pp_ru.respond(self) +$phd_site.respond(self) """) write_if_changed(os.path.join(root, "news.tmpl"), ''.join(new_text)) @@ -61,21 +55,23 @@ from atom_10 import atom_10 from rss_20 import rss_20 namespace = { - "title": "Oleg Broytmann's Personal Page - News", - "baseURL": "http://phd.pp.ru/", + "title": "Oleg Broytman's Personal Page - News", + "baseURL": "http://phdru.name/", "indexFile": "news.html", "description": "", "lang": lang, - "author": "Oleg Broytmann", - "email": "phd@phd.pp.ru", + "author": "Oleg Broytman", + "email": "phd@phdru.name", + "generator": os.path.basename(sys.argv[0]), "posts": news_items, } if lang == "ru": - namespace["title"] = "Oleg Broytmann's Personal Page - Russian News" - namespace["baseURL"] = baseURL = "http://phd.pp.ru/Russian/" + namespace["title"] = "Oleg Broytman's Personal Page - Russian News" + namespace["baseURL"] = baseURL = "http://phdru.name/Russian/" for item in news_items: item.baseURL = baseURL + item.title = item.title.decode('koi8-r').encode('utf-8') for item in news_items: href_parts = item.rel_link.split('/') @@ -88,7 +84,7 @@ for item in news_items: category = href_parts[0] if category: item.categoryList = [category] -atom_tmpl = str(atom_10(searchList=[namespace])) +atom_tmpl = unicode(atom_10(searchList=[namespace])).encode('koi8-r') write_if_changed(os.path.join(root, "atom_10.xml"), atom_tmpl) -rss_tmpl = str(rss_20(searchList=[namespace])) +rss_tmpl = unicode(rss_20(searchList=[namespace])).encode('koi8-r') write_if_changed(os.path.join(root, "rss_20.xml"), rss_tmpl)