Merge pull request #24 from isotoma/master

Python 3 compatibility & Django > 1.4 compatibility for tests.

rulez/backends.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import inspect
 
-from exceptions import NotBooleanPermission
-from exceptions import NonexistentFieldName
+from rulez.exceptions import NotBooleanPermission
+from rulez.exceptions import NonexistentFieldName
 
 from rulez import registry
 

rulez/models.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-import rolez.signals
+import rulez.rolez.signals

rulez/tests/__init__.py

@@ -1,5 +1,5 @@
-from roles_helpers import *
-from registry import *
-from backend import *
-from signals import *
-from templatetags import *
+from rulez.tests.roles_helpers import *
+from rulez.tests.registry import *
+from rulez.tests.backend import *
+from rulez.tests.signals import *
+from rulez.tests.templatetags import *

tests/testapp/manage.py

@@ -1,19 +1,13 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
-import imp
+import os
+
+from django.core.management import execute_from_command_line
 
 #Added for test runner
 import os, sys
 sys.path.insert(0, os.path.abspath('./../../'))
 
-try:
-    imp.find_module('settings') # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
-    sys.exit(1)
-
-import settings
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings')
+    execute_from_command_line()

tests/testapp/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin