diff options
| author | Aditi Mittal <aditi.iitr@gmail.com> | 2013-09-09 21:53:56 +0530 |
|---|---|---|
| committer | Aditi Mittal <aditi.iitr@gmail.com> | 2013-09-09 21:53:56 +0530 |
| commit | 728516261a99ede3687a9c4dd722f4f53d50ad71 (patch) | |
| tree | 0654df8ff4c3747de1f198e66170e35e988db5c1 /mediagoblin/media_types | |
| parent | 5d9ecb05ddb843c6b562111ae9f5d048849f11bd (diff) | |
| parent | 66cafc3b74d476710013efb46341b989028f3057 (diff) | |
| download | mediagoblin-728516261a99ede3687a9c4dd722f4f53d50ad71.tar.lz mediagoblin-728516261a99ede3687a9c4dd722f4f53d50ad71.tar.xz mediagoblin-728516261a99ede3687a9c4dd722f4f53d50ad71.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/media_types')
| -rw-r--r-- | mediagoblin/media_types/ascii/processing.py | 2 | ||||
| -rw-r--r-- | mediagoblin/media_types/image/processing.py | 2 |
2 files changed, 2 insertions, 2 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 |