Permalink
Browse files

Fixed problem with circular import, pyflakes

  • Loading branch information...
1 parent d414e2f commit 84289d87ee0063726b43948f517f591660c6c7bc @lukaszb lukaszb committed Feb 26, 2013
Showing with 1 addition and 7 deletions.
  1. +1 −1 guardian/compat.py
  2. +0 −1 guardian/management/__init__.py
  3. +0 −4 guardian/models.py
  4. +0 −1 guardian/utils.py
View
@@ -8,7 +8,7 @@
try:
from django.conf.urls import url, patterns, include, handler404, handler500
except ImportError:
- from django.conf.urls.defaults import url, patterns, include, handler404, handler500
+ from django.conf.urls.defaults import url, patterns, include, handler404, handler500 # pyflakes:ignore
__all__ = [
'User',
@@ -2,7 +2,6 @@
import django
from django.db.models import signals
-from django.conf import settings
from guardian import models as guardian_app
from guardian.conf import settings as guardian_settings
View
@@ -1,17 +1,13 @@
from __future__ import unicode_literals
-import django
from django.db import models
from django.core.exceptions import ValidationError
from django.contrib.auth.models import Group
from django.contrib.auth.models import Permission
-from django.contrib.auth.models import AnonymousUser
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes.generic import GenericForeignKey
from django.utils.translation import ugettext_lazy as _
-from guardian.compat import Group
-from guardian.compat import Permission
from guardian.compat import get_user_model
from guardian.compat import user_model_label
from guardian.compat import unicode
View
@@ -24,7 +24,6 @@
from guardian.conf import settings as guardian_settings
from guardian.exceptions import NotUserNorGroup
-User = get_user_model()
logger = logging.getLogger(__name__)
abspath = lambda *p: os.path.abspath(os.path.join(*p))

0 comments on commit 84289d8

Please sign in to comment.