Stop reusing internal APIs of Django (urlresolvers.get_callable)

matthiask · matthiask · commit 764c815b1cc9 · 2011-06-17T09:52:07.000+02:00
Remove unused code while at it.
diff --git a/feincms/content/application/models.py b/feincms/content/application/models.py
@@ -19,6 +19,7 @@
 
 from feincms.admin.editor import ItemEditorForm
 from feincms.contrib.fields import JSONField
+from feincms.utils import get_object
 
 try:
     from email.utils import parsedate
@@ -238,7 +239,7 @@ def __init__(self, *args, **kwargs):
                     if isinstance(admin_fields, dict):
                         self.custom_fields.update(admin_fields)
                     else:
-                        get_fields = urlresolvers.get_callable(admin_fields)
+                        get_fields = get_object(admin_fields)
                         self.custom_fields.update(get_fields(self, *args, **kwargs))
 
                     for k, v in self.custom_fields.items():
@@ -285,7 +286,7 @@ def process(self, request, **kwargs):
         # Provide a way for appcontent items to customize URL processing by
         # altering the perceived path of the page:
         if "path_mapper" in self.app_config:
-            path_mapper = urlresolvers.get_callable(self.app_config["path_mapper"])
+            path_mapper = get_object(self.app_config["path_mapper"])
             path, page_url = path_mapper(
                 request.path,
                 page_url,
@@ -314,7 +315,7 @@ def process(self, request, **kwargs):
         view_wrapper = self.app_config.get("view_wrapper", None)
         if view_wrapper:
             fn = partial(
-                urlresolvers.get_callable(view_wrapper),
+                get_object(view_wrapper),
                 view=fn,
                 appcontent_parameters=self.parameters
             )
diff --git a/feincms/module/medialibrary/models.py b/feincms/module/medialibrary/models.py
@@ -7,7 +7,6 @@
 from django.contrib import admin, messages
 from django.contrib.auth.decorators import permission_required
 from django.conf import settings as django_settings
-from django.core.urlresolvers import get_callable
 from django.db import models
 from django.template.defaultfilters import filesizeformat
 from django.utils.safestring import mark_safe
@@ -87,11 +86,6 @@ class MediaFileBase(Base, TranslatedObjectMixin):
     because of the (handy) extension mechanism.
     """
 
-    from django.core.files.storage import FileSystemStorage
-    default_storage_class = getattr(django_settings, 'DEFAULT_FILE_STORAGE',
-                                    'django.core.files.storage.FileSystemStorage')
-    default_storage = get_callable(default_storage_class)
-
     file = models.FileField(_('file'), max_length=255, upload_to=settings.FEINCMS_MEDIALIBRARY_UPLOAD_TO)
     type = models.CharField(_('file type'), max_length=12, editable=False, choices=())
     created = models.DateTimeField(_('created'), editable=False, default=datetime.now)
diff --git a/feincms/utils/__init__.py b/feincms/utils/__init__.py
@@ -50,14 +50,29 @@ class Entry(Base):
     {% feincms_prefill_entry_list object_list "authors,richtextcontent_set,imagecontent_set" %}
 """
 
-from django.core.urlresolvers import get_callable
 from django.db import connection
 from django.db.models import AutoField
 from django.db.models.fields import related
+from django.utils.importlib import import_module
 
 # ------------------------------------------------------------------------
 def get_object(path, fail_silently=False):
-    return get_callable(path, fail_silently)
+    # Return early if path isn't a string (might already be an callable or
+    # a class or whatever)
+    if not isinstance(path, (str, unicode)):
+        return path
+
+    try:
+        dot = path.rindex('.')
+        mod, fn = path[:dot], path[dot+1:]
+    except ValueError:
+        mod, fn = callback, ''
+
+    try:
+        return getattr(import_module(mod), fn)
+    except (AttributeError, ImportError):
+        if not fail_silently:
+            raise
 
 # ------------------------------------------------------------------------
 def prefilled_attribute(name):
