Fix json encoder and template hook registries (#1887)

Kwpolska · Kwpolska · commit e62b74ddf2ab · 2015-07-11T20:11:51.000+02:00
Signed-off-by: Chris Warrick &lt;kwpolska@gmail.com&gt;
diff --git a/nikola/post.py b/nikola/post.py
@@ -438,7 +438,7 @@ def deps(self, lang):
                 deps.extend([cand_1, cand_2])
         deps += self._get_dependencies(self._dependency_file_page[lang])
         deps += self._get_dependencies(self._dependency_file_page[None])
-        return deps
+        return sorted(deps)
 
     def deps_uptodate(self, lang):
         """Return a list of uptodate dependencies to build this post's page.
@@ -498,7 +498,7 @@ def fragment_deps(self, lang):
         deps = [d for d in deps if os.path.exists(d)]
         deps += self._get_dependencies(self._dependency_file_fragment[lang])
         deps += self._get_dependencies(self._dependency_file_fragment[None])
-        return deps
+        return sorted(deps)
 
     def fragment_deps_uptodate(self, lang):
         """Return a list of file dependencies to build this post's fragment."""
diff --git a/nikola/utils.py b/nikola/utils.py
@@ -492,13 +492,19 @@ def __hash__(self):
     def __str__(self):
         return '<TemplateHookRegistry: {0}>'.format(self._items)
 
+    def __repr__(self):
+        return '<TemplateHookRegistry: {0}>'.format(self.name)
+
 
 class CustomEncoder(json.JSONEncoder):
     def default(self, obj):
         try:
             return super(CustomEncoder, self).default(obj)
         except TypeError:
-            s = repr(obj).split('0x', 1)[0]
+            if isinstance(obj, set):
+                return self.encode(sorted(list(obj)))
+            else:
+                s = repr(obj).split('0x', 1)[0]
             return s
 
 
