diff --git a/pelican/generators.py b/pelican/generators.py
index 0d2fa6a9..ce102a31 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -120,7 +120,7 @@ class Generator(object):
         for item in items:
             value = getattr(self, item)
             if hasattr(value, 'items'):
-                value = list(value.items())
+                value = list(value.items())  # py3k safeguard for iterators
             self.context[item] = value
 
 
diff --git a/pelican/plugins/sitemap.py b/pelican/plugins/sitemap.py
index 0ade1288..8043baad 100644
--- a/pelican/plugins/sitemap.py
+++ b/pelican/plugins/sitemap.py
@@ -89,6 +89,7 @@ class SitemapGenerator(object):
                     'yearly', 'never')
 
             if isinstance(pris, dict):
+                # We use items for Py3k compat. .iteritems() otherwise
                 for k, v in pris.items():
                     if k in valid_keys and not isinstance(v, (int, float)):
                         default = self.priorities[k]
@@ -102,6 +103,7 @@ class SitemapGenerator(object):
                 warning("sitemap plugin: using the default values")
 
             if isinstance(chfreqs, dict):
+                # .items() for py3k compat.
                 for k, v in chfreqs.items():
                     if k in valid_keys and v not in valid_chfreqs:
                         default = self.changefreqs[k]
diff --git a/pelican/readers.py b/pelican/readers.py
index b182b6fa..5c2ae58c 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -246,6 +246,7 @@ def read_file(filename, fmt=None, settings=None):
     if filename_metadata:
         match = re.match(filename_metadata, base)
         if match:
+            # .items() for py3k compat.
             for k, v in match.groupdict().items():
                 if k not in metadata:
                     k = k.lower()  # metadata must be lowercase
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index c373cfd4..33041b0e 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -4,9 +4,11 @@
 from __future__ import unicode_literals, print_function
 import argparse
 try:
+    # py3k import
     from html.parser import HTMLParser
 except ImportError:
-    from HTMLParser import HTMLParser
+    # py2 import
+    from HTMLParser import HTMLParser  # NOQA
 import os
 import subprocess
 import sys