git merge master

pelican/readers.py

@@ -13,11 +13,8 @@ try:
     from markdown import Markdown
 except ImportError:
     Markdown = False  # NOQA
-import cgi
-from HTMLParser import HTMLParser
 import re
 
-
 from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, open
 

pelican/themes/notmyidea/static/css/main.css

@@ -312,6 +312,7 @@ img.left, figure.left {float: right; margin: 0 0 2em 2em;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.org');}
 
 /*
 	About

pelican/themes/notmyidea/templates/index.html

@@ -41,12 +41,12 @@
                 </div><!-- /.entry-content -->
             </article></li>
         {% endif %}
-        {% if loop.last and (articles_page.has_previous() 
-           or not articles_page.has_previous() and loop.length > 1) %}
-            {% include 'pagination.html' %}
-        {% endif %}
         {% if loop.last %}
             </ol><!-- /#posts-list -->
+            {% if loop.last and (articles_page.has_previous() 
+            or not articles_page.has_previous() and loop.length > 1) %}
+                {% include 'pagination.html' %}
+            {% endif %}
             </section><!-- /#content -->
         {% endif %}
     {% endfor %}

pelican/themes/simple/templates/gosquared.html

@@ -0,0 +1,14 @@
+{% if GOSQUARED_SITENAME %}
+<script type="text/javascript">
+    var GoSquared={};
+    GoSquared.acct = "{{ GOSQUARED_SITENAME }}";
+    (function(w){
+        function gs(){
+            w._gstc_lt=+(new Date); var d=document;
+            var g = d.createElement("script"); g.type = "text/javascript"; g.async = true; g.src = "//d1l6p2sc9645hc.cloudfront.net/tracker.js";
+            var s = d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(g, s);
+        }
+        w.addEventListener?w.addEventListener("load",gs,false):w.attachEvent("onload",gs);
+    })(window);
+</script>
+{% endif %}

pelican/utils.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import contextlib
 import os
 import re
 import pytz
@@ -34,10 +33,10 @@ def get_date(string):
             pass
     raise ValueError("'%s' is not a valid date" % string)
 
-@contextlib.contextmanager
+
 def open(filename):
     """Open a file and return it's content"""
-    yield _open(filename, encoding='utf-8').read()
+    return _open(filename, encoding='utf-8').read()
 
 
 def slugify(value):