Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py
index f42edfdd8b0c33038ddcf350aa777af368d3074e..3b287877d3047de13fa19c437b028edfc05fbec2 100644 (file)
--- a/mediagoblin/media_types/ascii/processing.py
+++ b/mediagoblin/media_types/ascii/processing.py
@@ -60,7 +60,7 @@ class CommonAsciiProcessor(MediaProcessor):
 
          # Conversions subdirectory to avoid collisions
         self.conversions_subdir = os.path.join(
-            self.workbench.dir, 'convirsions')
+            self.workbench.dir, 'conversions')
         os.mkdir(self.conversions_subdir)
 
         # Pull down and set up the processing file

diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py
index 555a0e0a625d25bca6dc0abb8119ebd14c5fec1f..4c7bdb15935d625ec4ddbf246742ec7315031be9 100644 (file)
--- a/mediagoblin/media_types/image/processing.py
+++ b/mediagoblin/media_types/image/processing.py
@@ -144,7 +144,7 @@ class CommonImageProcessor(MediaProcessor):
         ## @@: Should this be two functions?
         # Conversions subdirectory to avoid collisions
         self.conversions_subdir = os.path.join(
-            self.workbench.dir, 'convirsions')
+            self.workbench.dir, 'conversions')
         os.mkdir(self.conversions_subdir)
 
         # Pull down and set up the processing file

diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py
index 9dcdf13ce44329c205512b738ac71ad0fedbcdc2..3b36fca9b467d8fb515a5154f8819f6112f39b0f 100644 (file)
--- a/mediagoblin/processing/__init__.py
+++ b/mediagoblin/processing/__init__.py
@@ -14,7 +14,13 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from collections import OrderedDict
+# Use an ordered dict if we can.  If not, we'll just use a normal dict
+# later.
+try:
+    from collections import OrderedDict
+except:
+    OrderedDict = None
+
 import logging
 import os
 
@@ -187,7 +193,10 @@ class ProcessingManager(object):
     """
     def __init__(self):
         # Dict of all MediaProcessors of this media type
-        self.processors = OrderedDict()
+        if OrderedDict is not None:
+            self.processors = OrderedDict()
+        else:
+            self.processors = {}
 
     def add_processor(self, processor):
         """