Now passing strings to mimetypes.guess_extension.

Also changing the default for images to .img (from None).

Also, whatever was originally implementing mime2extension did not include
the leading dot that mimetypes includes.  We are doing away with that, too.

This is supposed to address bug #552.

CHANGES.rst

@@ -1,6 +1,12 @@
 1.6 (unreleased)
 ================
 
+Bug Fixes
+---------
+
+- cachedataset() and friends again produce reasonable file extensions.
+  [#553]
+
 Enhancements and Fixes
 ----------------------
 
@@ -23,7 +29,7 @@ Enhancements and Fixes
   them. [#517]
 
 - Introducing the new MIVOT module, enabling processed VOTable data mapped to
-  any model serialized in VO-DML. This package dynamically generates python objects 
+  any model serialized in VO-DML. This package dynamically generates python objects
   whose structure corresponds to the classes of the mapped models. [#497]
 
 Deprecations and Removals

pyvo/dal/mimetype.py

@@ -25,8 +25,11 @@ def mime2extension(mimetype, default=None):
     implementations of ``suggest_extension()`` in ``Record`` subclasses.
 
       >>> mime2extension('application/fits')
+      'fits'
       >>> mime2extension('image/jpeg')
+      'jpg'
       >>> mime2extension('application/x-zed', 'dat')
+      'dat'
 
     Parameters
     ----------
@@ -46,11 +49,14 @@ def mime2extension(mimetype, default=None):
     if not mimetype:
         return default
 
-    if isinstance(mimetype, str):
-        mimetype = mimetype.encode('utf-8')
+    if isinstance(mimetype, bytes):
+        mimetype = mimetype.decode('utf-8')
 
     ext = mimetypes.guess_extension(mimetype, strict=False)
-    return ext
+    if ext is None:
+        return default
+
+    return ext.lstrip(".")
 
 
 def mime_object_maker(url, mimetype, *, session=None):

pyvo/dal/sia.py

@@ -903,7 +903,7 @@ def suggest_dataset_basename(self):
             out = re.sub(r'\s+', '_', out.strip())
         return out
 
-    def suggest_extension(self, *, default=None):
+    def suggest_extension(self, *, default='img'):
         """
         returns a recommended filename extension for the dataset described
         by this record.  Typically, this would look at the column describing