diff options
| -rw-r--r-- | mediagoblin/media_types/ascii/processing.py | 2 | ||||
| -rw-r--r-- | mediagoblin/media_types/image/processing.py | 2 | ||||
| -rw-r--r-- | mediagoblin/processing/__init__.py | 13 |
3 files changed, 13 insertions, 4 deletions
diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py index f42edfdd..3b287877 100644 --- 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 555a0e0a..4c7bdb15 100644 --- 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 9dcdf13c..3b36fca9 100644 --- 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): """ |