Merge pull request #2269 from beetbox/drop-idfallback-dict

drop IdentityFallbackDict and use get(key, key) instead

beets/mediafile.py

@@ -59,7 +59,6 @@ import enum
 
 from beets import logging
 from beets.util import displayable_path, syspath, as_string
-from beets.util.collections import IdentityFallbackDict
 import six
 
 
@@ -82,7 +81,7 @@ TYPES = {
     'aiff': 'AIFF',
 }
 
-PREFERRED_IMAGE_EXTENSIONS = IdentityFallbackDict({'jpeg': 'jpg'})
+PREFERRED_IMAGE_EXTENSIONS = {'jpeg': 'jpg'}
 
 
 # Exceptions.
@@ -355,7 +354,8 @@ def image_mime_type(data):
 
 
 def image_extension(data):
-    return PREFERRED_IMAGE_EXTENSIONS[_imghdr_what_wrapper(data)]
+    ext = _imghdr_what_wrapper(data)
+    return PREFERRED_IMAGE_EXTENSIONS.get(ext, ext)
 
 
 class ImageType(enum.Enum):

beets/util/collections.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# This file is part of beets.
-# Copyright 2016, Adrian Sampson.
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-"""Custom collections classes.
-"""
-
-from __future__ import division, absolute_import, print_function
-
-
-class IdentityFallbackDict(dict):
-    """A dictionary which is "transparent" (maps keys to themselves) for all
-    keys not in it.
-    """
-    def __getitem__(self, key):
-        try:
-            return dict.__getitem__(self, key)
-        except KeyError:
-            return key