Merge pull request bread-and-pepper#292 from rosscdh/lp

Requirements update.

setup.py

@@ -23,9 +23,8 @@
       packages = find_packages(exclude=['demo', 'demo.*']),
       include_package_data=True,
       install_requires = [
-        'Django>=1.3.1',
         'easy_thumbnails',
-        'django-guardian>=0.1.0',
+        'django-guardian>=1.1.0.beta',
         ### Required to build documentation
         # 'sphinx',
         # 'south',

userena/managers.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.db.models import Q
+from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.auth.models import UserManager, Permission, AnonymousUser
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext as _
@@ -206,7 +207,9 @@ def check_permissions(self):
             if model == 'profile':
                 model_obj = get_profile_model()
             else: model_obj = get_user_model()
+
             model_content_type = ContentType.objects.get_for_model(model_obj)
+
             for perm in perms:
                 try:
                     Permission.objects.get(codename=perm[0],
@@ -222,7 +225,7 @@ def check_permissions(self):
         for user in get_user_model().objects.exclude(id=settings.ANONYMOUS_USER_ID):
             try:
                 user_profile = user.get_profile()
-            except get_profile_model().DoesNotExist:
+            except ObjectDoesNotExist:
                 warnings.append(_("No profile found for %(username)s") \
                                     % {'username': user.username})
             else: