aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-08-28 08:14:26 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-08-29 08:22:16 -0700
commit738cc499261e60a111f4ab76ebf94576d448e01c (patch)
tree771e854f3a686d1fee8036407d62fbad69b57d1a
parent9ff68c224e4254aea29f95c2e5a92290c52064d8 (diff)
downloadmediagoblin-738cc499261e60a111f4ab76ebf94576d448e01c.tar.lz
mediagoblin-738cc499261e60a111f4ab76ebf94576d448e01c.tar.xz
mediagoblin-738cc499261e60a111f4ab76ebf94576d448e01c.zip
ascii media_type now have their own config_spec.ini
-rw-r--r--mediagoblin/config_spec.ini3
-rw-r--r--mediagoblin/media_types/ascii/config_spec.ini4
-rw-r--r--mediagoblin/media_types/ascii/processing.py4
3 files changed, 6 insertions, 5 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 1837a89b..9ad44fc6 100644
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -104,9 +104,6 @@ max_height = integer(default=640)
max_width = integer(default=180)
max_height = integer(default=180)
-[media_type:mediagoblin.media_types.ascii]
-thumbnail_font = string(default=None)
-
[media_type:mediagoblin.media_types.pdf]
pdf_js = boolean(default=True)
diff --git a/mediagoblin/media_types/ascii/config_spec.ini b/mediagoblin/media_types/ascii/config_spec.ini
new file mode 100644
index 00000000..24b05053
--- /dev/null
+++ b/mediagoblin/media_types/ascii/config_spec.ini
@@ -0,0 +1,4 @@
+[plugin_spec]
+thumbnail_font = string(default=None)
+
+
diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py
index 9b6b3ad4..f42edfdd 100644
--- a/mediagoblin/media_types/ascii/processing.py
+++ b/mediagoblin/media_types/ascii/processing.py
@@ -55,8 +55,8 @@ class CommonAsciiProcessor(MediaProcessor):
acceptable_files = ['original', 'unicode']
def common_setup(self):
- self.ascii_config = mgg.global_config[
- 'media_type:mediagoblin.media_types.ascii']
+ self.ascii_config = mgg.global_config['plugins'][
+ 'mediagoblin.media_types.ascii']
# Conversions subdirectory to avoid collisions
self.conversions_subdir = os.path.join(