Merge branch 'alurin-master'

* alurin-master:
  fix ImportError
  Fix imports and string types for work with Python 3

breadcrumbs/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 __version__ = '1.1.3-p1'
 
-from breadcrumbs import Breadcrumb
+from .breadcrumbs import Breadcrumb

breadcrumbs/breadcrumbs.py

@@ -1,12 +1,16 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 """
 Classes to add request.breadcrumbs as one class to have a list of breadcrumbs
 TODO: maybe is better to move to contrib/breadcrumbs
 """
 
 from django.conf import settings
-from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext as _
+try:
+    from django.utils import six
+except ImportError:
+    import six
 
 
 class BreadcrumbsInvalidFormat(Exception):
@@ -141,8 +145,8 @@ def __validate(self, obj, index):
         if type(obj) in (list, tuple):
             if len(obj) == 2:
                 if (not obj[0] and not obj[1]) or \
-                        (type(obj[0]) not in (str, unicode) and \
-                        type(obj[1]) not in (str, unicode)):
+                        not isinstance(obj[0], six.string_types) and \
+                        not isinstance(obj[1], six.string_types):
                     raise BreadcrumbsInvalidFormat(u"Invalid format for \
                         breadcrumb %s in %s" % (index, type(obj).__name__))
             if len(obj) != 2:

breadcrumbs/middleware.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from django.conf import settings
 from django.http import Http404
-from breadcrumbs import Breadcrumbs
-from views import flatpage
+from .breadcrumbs import Breadcrumbs
+from .views import flatpage
 
 
 class BreadcrumbsMiddleware(object):

breadcrumbs/models.py

@@ -2,7 +2,7 @@
 from django.contrib.flatpages.models import FlatPage
 from django.core.cache import cache
 from django.db.models.signals import post_save
-from utils import make_flatpages_cache_key
+from .utils import make_flatpages_cache_key
 
 
 def clean_flatpages_cache(sender, **kw):

breadcrumbs/utils.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django.contrib.flatpages.models import FlatPage
 from django.http import Http404
-from breadcrumbs import Breadcrumbs, BreadcrumbsNotSet
+from .breadcrumbs import Breadcrumbs, BreadcrumbsNotSet
 from django.conf import settings
 from django.core.cache import cache
 

breadcrumbs/views.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.contrib.flatpages.views import render_flatpage
 from django.http import Http404, HttpResponsePermanentRedirect
-from utils import breadcrumbs_for_flatpages, get_flapage_from_cache
+from .utils import breadcrumbs_for_flatpages, get_flapage_from_cache
 
 
 def flatpage(request, url):

setup.py

@@ -27,5 +27,5 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
     ],
-    install_requires=["Django>=1.3.4"],
+    install_requires=["Django>=1.3.4", "six"],
 )