Updates for Django v1.9

Author: rerb

.gitignore

@@ -0,0 +1,20 @@
+*.pyc
+.coverage
+/export
+.DS_Store
+.DS_Store?
+.envrc
+htmlcov
+ghostdriver.log
+celerybeat-schedule
+celerybeat.pid
+stellar.yaml
+\#*\#
+*.flymake.py
+.idea
+*~undo-tree~
+.python-version
+
+export.zip
+.ignore
+*.ipynb

logical_rules/helpers.py

@@ -1,9 +1,9 @@
-import sys
+import imp
+from importlib import import_module
+from django.conf import settings
+
 
 def import_rules(app):
-    from django.utils.importlib import import_module
-    import imp
-    import sys
 
     try:
         app_path = import_module(app).__path__
@@ -18,8 +18,8 @@ def import_rules(app):
     module = import_module('%s.rules' % app)
     return module
 
+
 def autodiscover():
-    from django.conf import settings
 
     for app in settings.INSTALLED_APPS:
         import_rules(app)

logical_rules/rules.py

@@ -13,7 +13,7 @@ def __call__(self, topping_list, pizza_place):
 
 can_make_pizza = CanMakePizza
 rules.register('can_make_pizza', can_make_pizza)
-    
+
 def can_eat_pizza(person, topping_list):
     for t in topping_list:
         if t in person.dislike_list:
@@ -24,14 +24,20 @@ def can_eat_pizza(person, topping_list):
 """
 import logical_rules
 
+
 def evaluate_expression(exp):
     return exp
+
+
 logical_rules.site.register('evaluate_expression', evaluate_expression)
 
+
 def user_is_authenticated(user):
     """
         Added to the rule set automatically as an alternative to the
         login_required decorator
     """
     return user.is_authenticated()
+
+
 logical_rules.site.register('user_is_authenticated', user_is_authenticated)

requirements.txt

@@ -1 +1 @@
-Django==1.4
+Django>=1.9

setup.py

@@ -21,7 +21,7 @@ def read(fname):
         'logical_rules.tests.test_app',
         ],
       install_requires=[
-              "Django >= 1.4",
+              "Django >= 1.9",
               ],
       classifiers=[
               'Development Status :: 4 - Beta',

tests.py

@@ -13,6 +13,7 @@ def main():
     sys.exc_clear()
 
     os.environ["DJANGO_SETTINGS_MODULE"] = "django.conf.global_settings"
+
     from django.conf import global_settings
 
     global_settings.INSTALLED_APPS = (
@@ -38,7 +39,7 @@ def main():
         global_settings.DATABASE_NAME = ":memory:"
 
     global_settings.ROOT_URLCONF = 'logical_rules.tests.test_app.urls'
-    
+
     global_settings.MIDDLEWARE_CLASSES = (
         'django.middleware.common.CommonMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
@@ -49,17 +50,18 @@ def main():
 
     global_settings.SECRET_KEY = "blahblah"
     global_settings.DEBUG = True
-    global_settings.TEMPLATE_DUBUG = True
+    global_settings.TEMPLATE_DEBUG = True
+    global_settings.SECRET_KEY = "guesswho"
+
+    django.setup()
 
     from django.test.utils import get_runner
     test_runner = get_runner(global_settings)
-    
-    if django.VERSION > (1,2):
-        test_runner = test_runner()
-        failures = test_runner.run_tests(['logical_rules',])
-    else:
-        failures = test_runner(['logical_rules',], verbosity=2)
+
+    test_runner = test_runner()
+    failures = test_runner.run_tests(['logical_rules',])
+
     sys.exit(failures)
 
 if __name__ == '__main__':
-    main()
+    main()