From 6d22eaac35f799f22f4c88380b73a8e4ef927ead Mon Sep 17 00:00:00 2001
From: Stefan Koegl <stefan@skoegl.net>
Date: Tue, 22 Jun 2010 23:17:03 +0200
Subject: [PATCH] rename mimetypes module to avoid name conflict

---
 mygpo/api/backend.py                     | 2 +-
 mygpo/data/feeddownloader.py             | 2 +-
 mygpo/data/{mimetypes.py => mimetype.py} | 4 ++++
 mygpo/web/templatetags/episodes.py       | 2 +-
 mygpo/web/views/__init__.py              | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)
 rename mygpo/data/{mimetypes.py => mimetype.py} (97%)

diff --git a/mygpo/api/backend.py b/mygpo/api/backend.py
index cd104385..73f23680 100644
--- a/mygpo/api/backend.py
+++ b/mygpo/api/backend.py
@@ -16,7 +16,7 @@
 #
 
 from mygpo.api.models import ToplistEntry, Podcast, Subscription, EpisodeToplistEntry
-from mygpo.data.mimetypes import get_type, CONTENT_TYPES
+from mygpo.data.mimetype import get_type, CONTENT_TYPES
 from django.db.models import Max
 from datetime import datetime, timedelta
 import re
diff --git a/mygpo/data/feeddownloader.py b/mygpo/data/feeddownloader.py
index 79dd4cb7..c310123d 100755
--- a/mygpo/data/feeddownloader.py
+++ b/mygpo/data/feeddownloader.py
@@ -35,7 +35,7 @@ from mygpo.data.models import PodcastTag
 from mygpo.utils import parse_time
 from mygpo.api.sanitizing import sanitize_url, rewrite_podcasts
 from mygpo.data import youtube
-from mygpo.data.mimetypes import get_mimetype, check_mimetype, get_podcast_types
+from mygpo.data.mimetype import get_mimetype, check_mimetype, get_podcast_types
 
 socket.setdefaulttimeout(10)
 fetcher = feedcore.Fetcher(USER_AGENT)
diff --git a/mygpo/data/mimetypes.py b/mygpo/data/mimetype.py
similarity index 97%
rename from mygpo/data/mimetypes.py
rename to mygpo/data/mimetype.py
index 56219380..12e2201b 100644
--- a/mygpo/data/mimetypes.py
+++ b/mygpo/data/mimetype.py
@@ -1,5 +1,6 @@
 from mygpo.api.models import Podcast, Episode
 from collections import defaultdict
+import mimetypes
 
 # If 20% of the episodes of a podcast are of a given type,
 # then the podcast is considered to be of that type, too
@@ -34,6 +35,9 @@ def get_type(mimetype):
     All "wanted" mimetypes are mapped to one of audio/video/image
     Everything else returns None
     """
+    if not mimetype:
+        return None
+
     if '/' in mimetype:
         category, type = mimetype.split('/', 1)
         if category in ('audio', 'video', 'image'):
diff --git a/mygpo/web/templatetags/episodes.py b/mygpo/web/templatetags/episodes.py
index 0f06ca2d..a9502f57 100644
--- a/mygpo/web/templatetags/episodes.py
+++ b/mygpo/web/templatetags/episodes.py
@@ -3,7 +3,7 @@ from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 
 from mygpo import utils
-from mygpo.data.mimetypes import get_type, get_mimetype
+from mygpo.data.mimetype import get_type, get_mimetype
 
 register = template.Library()
 
diff --git a/mygpo/web/views/__init__.py b/mygpo/web/views/__init__.py
index 71c65e90..66aa5533 100644
--- a/mygpo/web/views/__init__.py
+++ b/mygpo/web/views/__init__.py
@@ -22,7 +22,7 @@ from django.contrib.auth.models import User
 from django.template import RequestContext
 from mygpo.api.models import Podcast, Episode, Device, EpisodeAction, SubscriptionAction, ToplistEntry, EpisodeToplistEntry, Subscription, SuggestionEntry, SyncGroup, SUBSCRIBE_ACTION, UNSUBSCRIBE_ACTION, SubscriptionMeta, UserProfile
 from mygpo.data.models import Listener, SuggestionBlacklist
-from mygpo.data.mimetypes import CONTENT_TYPES
+from mygpo.data.mimetype import CONTENT_TYPES
 from mygpo.web.models import Rating, SecurityToken
 from mygpo.web.forms import UserAccountForm, DeviceForm, SyncForm, PrivacyForm, ResendActivationForm
 from django.forms import ValidationError
-- 
2.11.4.GIT