Merge pull request #26 from Tourmanage/django-1.7

Django 1.7 support

Author: borgstrom

.travis.yml

@@ -3,12 +3,26 @@ language: python
 python:
   - 2.6
   - 2.7
+  - 3.2
+  - 3.3
   - pypy
 
+env:
+  - DJANGO=Django==1.6
+  - DJANGO=git+https://github.com/django/django.git@stable/1.7.x
+
+matrix:
+  exclude:
+    - python: 2.6
+      env: DJANGO=git+https://github.com/django/django.git@stable/1.7.x
+  allow_failures:
+    - env: DJANGO=git+https://github.com/django/django.git@stable/1.7.x
+
 install:
-  - pip install -e .
-  - pip install --use-mirrors coveralls
-  - pip install --use-mirrors nose
+  - pip install -q -e .
+  - pip install -q $DJANGO
+  - pip install -q --use-mirrors coveralls
+  - pip install -q --use-mirrors nose
 
 script: coverage run --source=menu `which django-admin.py` test --settings=menu.test_settings menu
 

menu/menu.py

@@ -1,6 +1,11 @@
+import re
+
 from django.conf import settings
 
-import re
+try:
+    from django.apps import apps
+except ImportError:
+    apps = False
 
 
 class Menu(object):
@@ -47,15 +52,20 @@ def load_menus(c):
         if c.loaded:
             return
 
+        # Fetch all installed app names
+        app_names = settings.INSTALLED_APPS
+        if apps:
+            app_names = [app_config.name for app_config in apps.get_app_configs()]
+
         # loop through our INSTALLED_APPS
-        for app in settings.INSTALLED_APPS:
+        for app in app_names:
             # skip any django apps
             if app.startswith("django."):
                 continue
 
             menu_module = '%s.menus' % app
             try:
-                __import__(menu_module, fromlist=["menu"])
+                __import__(menu_module, fromlist=["menu", ])
             except ImportError:
                 pass