Merge branch 'Spindel-master'

update to make this Python3 friendly

examples/siglican_gallery.html

@@ -4,7 +4,7 @@
 {% block content %}
 <h2>albums</h2>
 <ul>
-{% for aname,album in ALBUMS.iteritems() %}
+{% for aname,album in ALBUMS.items() %}
 <li>{{ aname }}<a href="{{ SITEURL }}/{{ SIGLICAN_DESTINATION }}/{{ album.url }}"><img src="{{ SITEURL }}/{{ SIGLICAN_DESTINATION }}/{{ album.thumbnail }}"></a>
 {% endfor %}
 </ul>

siglican.py

@@ -94,7 +94,7 @@ class SigalGalleryGenerator(Generator):
         # this needs to be first to establish pelican settings:
         super(SigalGalleryGenerator, self).__init__(*args, **kwargs)
         # add default sigal settings to generator settings:
-        for k in _DEFAULT_SIGLICAN_SETTINGS.keys()[:]:
+        for k in list(_DEFAULT_SIGLICAN_SETTINGS.keys()):
             self.settings[k] = self.settings.get(k, _DEFAULT_SIGLICAN_SETTINGS[k])
             #logger.debug("sigal.pelican: setting %s: %s",k,self.settings[k])
         self._clean_settings()
@@ -189,7 +189,7 @@ class SigalGalleryGenerator(Generator):
         self.context['ALBUMS'] = self.albums  # ** change to SIGLICAN_ALBUMS?
 
         # update the jinja context with the default sigal settings:
-        for k,v in _DEFAULT_SIGLICAN_SETTINGS.iteritems():
+        for k,v in _DEFAULT_SIGLICAN_SETTINGS.items():
             if not k in self.context:
                 self.context[k] = v
 
@@ -265,8 +265,10 @@ class SigalGalleryGenerator(Generator):
             ##   - bring back Writer options that Sigal had?
             ##   - make sure thumbnails don't break in some cases [fixed?]
 
+
 def get_generators(generators):
     return SigalGalleryGenerator
 
+
 def register():
     signals.get_generators.connect(get_generators)