Merge branch 'release-1.0.6'

otto-torino · Oct 24, 2017 · 42f3d85 · 42f3d85
2 parents 5acb346 + 80f20ff
commit 42f3d85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/baton/views.py b/baton/views.py
@@ -98,7 +98,7 @@ def get_app_voice(self, item):
         if self.check_apps_permission([item.get('name', None)]):
             children = []
             if item.get('models', None) is None:
-                for name, model in self.apps_dict[item.get('name')]['models'].iteritems(): # noqa
+                for name, model in self.apps_dict[item.get('name')]['models'].items(): # noqa
                     children.append({
                         'type': 'model',
                         'label': model.get('name', ''),

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='django-baton',
-    version='1.0.5',
+    version='1.0.6',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',
@@ -36,6 +36,7 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development',
         'Topic :: Software Development :: User Interfaces',
     ]