From 026ddd134c2a47ab83069548c56f2e3d4cc04464 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Sun, 13 Mar 2016 17:53:56 +0100 Subject: [PATCH] More https fixes --- source/blog/blog.cgi | 56 +++++-------------- .../fantastic-photos-of-our-solar-system.rst | 3 +- .../blog/posts/2009/11/06-ted:-witricity.rst | 24 +------- .../2010/02/13-la-odisea-del-pasaporte.rst | 8 --- .../blog/posts/2011/05/23-10-songs-of....rst | 17 +----- ...babas\303\263nicos---dop\303\241dromo.rst" | 18 ------ ...10-delirious-songs-with-strange-vocals.rst | 17 +----- 7 files changed, 19 insertions(+), 124 deletions(-) diff --git a/source/blog/blog.cgi b/source/blog/blog.cgi index f59201a..0875ea7 100755 --- a/source/blog/blog.cgi +++ b/source/blog/blog.cgi @@ -548,7 +548,7 @@ def valid_link(link): if re.match(mail_re, link, re.I): return 'mailto:' + link elif re.match(url_re, link, re.I): - return 'http://' + link + return 'https://' + link return None @@ -563,7 +563,7 @@ try: s = os.environ['SCRIPT_NAME'] if p == '80': p = '' else: p = ':' + p - full_url = 'http://%s%s%s' % (n, p, s) + full_url = 'https://%s%s%s' % (n, p, s) except KeyError: full_url = 'Not needed' @@ -927,51 +927,21 @@ class Article (object): import re rst = re.sub(r'.. youtube:: (.*)', r'''.. raw:: html -
- - - - - - -
''', rst) + + ''', rst) rst = re.sub(r'.. vimeo:: (\w*)', r'''.. raw:: html -
- - - - - - - -
''', rst) + + ''', rst) rst = re.sub(r'.. grooveshark:: (\w*)', r'''.. raw:: html -
- - - - - - - -
''', rst) + Grooveshark is no more! This was supposed to show \1. + ''', rst) return rst_to_html(rst) def to_vars(self): diff --git a/source/blog/posts/2009/09/fantastic-photos-of-our-solar-system.rst b/source/blog/posts/2009/09/fantastic-photos-of-our-solar-system.rst index 836b646..68dffda 100644 --- a/source/blog/posts/2009/09/fantastic-photos-of-our-solar-system.rst +++ b/source/blog/posts/2009/09/fantastic-photos-of-our-solar-system.rst @@ -1,8 +1,7 @@ Title: Fantastic Photos of our Solar System Tags: es, en, photo, solar system, sun, flare -.. image:: http://media.smithsonianmag.com/images/erupting-prominence-3.jpg - :alt: Erupting Prominence +Erupting Prominence: http://media.smithsonianmag.com/images/erupting-prominence-3.jpg More `fantastic photos of our solar system`__. diff --git a/source/blog/posts/2009/11/06-ted:-witricity.rst b/source/blog/posts/2009/11/06-ted:-witricity.rst index 3343c83..c271bcf 100644 --- a/source/blog/posts/2009/11/06-ted:-witricity.rst +++ b/source/blog/posts/2009/11/06-ted:-witricity.rst @@ -26,27 +26,9 @@ __ http://www.ted.com/talks/eric_giler_demos_wireless_electricity.html .. raw:: html -
- - - - - - - - - -
- + .. _RFID: http://en.wikipedia.org/wiki/Radio-frequency_identification diff --git a/source/blog/posts/2010/02/13-la-odisea-del-pasaporte.rst b/source/blog/posts/2010/02/13-la-odisea-del-pasaporte.rst index 108c137..ef0f87b 100644 --- a/source/blog/posts/2010/02/13-la-odisea-del-pasaporte.rst +++ b/source/blog/posts/2010/02/13-la-odisea-del-pasaporte.rst @@ -27,14 +27,6 @@ recorrido`__. __ http://quikmaps.com/full/131436 -.. raw:: html - -
-
- Hacia el consulado ================== diff --git a/source/blog/posts/2011/05/23-10-songs-of....rst b/source/blog/posts/2011/05/23-10-songs-of....rst index 44ed804..ae3b196 100644 --- a/source/blog/posts/2011/05/23-10-songs-of....rst +++ b/source/blog/posts/2011/05/23-10-songs-of....rst @@ -10,22 +10,7 @@ bands, but maybe in the future I can go more *global*. This time, the theme is **songs that have, in one way or another, some native rhythm**. -.. raw:: html - -
- - - - - - - -
+[Groveshark died, and with it this list] .. vim: set et sw=3 sts=3 : diff --git "a/source/blog/posts/2011/06/12-babas\303\263nicos---dop\303\241dromo.rst" "b/source/blog/posts/2011/06/12-babas\303\263nicos---dop\303\241dromo.rst" index 8d8f132..94c956d 100644 --- "a/source/blog/posts/2011/06/12-babas\303\263nicos---dop\303\241dromo.rst" +++ "b/source/blog/posts/2011/06/12-babas\303\263nicos---dop\303\241dromo.rst" @@ -7,23 +7,5 @@ a **good album**! __ http://en.wikipedia.org/wiki/Dop%C3%A1dromo __ http://en.wikipedia.org/wiki/Babas%C3%B3nicos -So here, listen: - -.. raw:: html - -
- - - - - - - -
.. vim: set et sw=3 sts=3 : diff --git a/source/blog/posts/2011/07/06-10-delirious-songs-with-strange-vocals.rst b/source/blog/posts/2011/07/06-10-delirious-songs-with-strange-vocals.rst index 7588bcd..ecdcaa5 100644 --- a/source/blog/posts/2011/07/06-10-delirious-songs-with-strange-vocals.rst +++ b/source/blog/posts/2011/07/06-10-delirious-songs-with-strange-vocals.rst @@ -3,21 +3,6 @@ Tags: en, es, 10 songs of, playlist, music, grooveshark, delirious, vocals 10 canciones delirantes con voces extrañas -.. raw:: html - -
- - - - - - - -
+[Grooveshark murió y con él esta lista] .. vim: set et sw=3 sts=3 : -- 2.43.0