Merge pull request #433 from gratipay/issue431

fix for #431

aspen/resources/simplate.py

@@ -230,12 +230,16 @@ def _unbound_parse_specline(self, specline):
 
         #Assign parts
         media_type, renderer = parts
+        if media_type == '':
+            # no media type specified, use the default
+            media_type = self.media_type
         if renderer == '':
+            # no renderer specified, use the default
             renderer = self.website.default_renderers_by_media_type[media_type]
 
         # Validate media type.
         if media_type_re.match(media_type) is None:
-            msg = ("Malformed media type %s in specline %s. It must match "
+            msg = ("Malformed media type '%s' in specline '%s'. It must match "
                    "%s.")
             msg %= (media_type, specline, media_type_re.pattern)
             raise SyntaxError(msg)

tests/test_simplates.py

@@ -4,6 +4,16 @@
 from __future__ import unicode_literals
 
 
+
+def test_default_media_type_works(harness):
+    harness.fs.www.mk(('index.spt', """
+[---]
+[---]
+plaintext"""))
+    response = harness.client.GET(raise_immediately=False)
+    assert "plaintext" in response.body
+
+
 def test_can_use_request_headers(harness):
     response = harness.simple( "foo = request.headers['Foo']\n"
                                "[-----] via stdlib_format\n"