Merge tag 'upstream/6.3.0'

Upstream version 6.3.0

1 files changed, 9 insertions, 2 deletions

diff --git a/nikola/plugins/compile/bbcode.py b/nikola/plugins/compile/bbcode.py
index e998417..5345be3 100644
--- a/nikola/plugins/compile/bbcode.py
+++ b/nikola/plugins/compile/bbcode.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2012-2013 Roberto Alsina and others.
+# Copyright © 2012-2014 Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -37,6 +37,10 @@ except ImportError:
 
 from nikola.plugin_categories import PageCompiler
 from nikola.utils import makedirs, req_missing
+try:
+    from collections import OrderedDict
+except ImportError:
+    OrderedDict = None  # NOQA
 
 
 class CompileBbcode(PageCompiler):
@@ -63,7 +67,10 @@ class CompileBbcode(PageCompiler):
             out_file.write(output)
 
     def create_post(self, path, onefile=False, **kw):
-        metadata = {}
+        if OrderedDict is not None:
+            metadata = OrderedDict()
+        else:
+            metadata = {}
         metadata.update(self.default_metadata)
         metadata.update(kw)
         makedirs(os.path.dirname(path))