Merge pull request #137 from jpulec/remove-django-1.8-deprecation-war…

…ning Fix deprecation error for Django 1.8
jazzband · Nov 4, 2014 · 13be41e · 13be41e
2 parents e20cf9e + 31e03f4
commit 13be41e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/simple_history/admin.py b/simple_history/admin.py
@@ -34,9 +34,9 @@ def get_urls(self):
         admin_site = self.admin_site
         opts = self.model._meta
         try:
-            info = opts.app_label, opts.module_name
-        except AttributeError:
             info = opts.app_label, opts.model_name
+        except AttributeError:
+            info = opts.app_label, opts.module_name
         history_urls = patterns(
             "",
             url("^([^/]+)/history/([^/]+)/$",

diff --git a/simple_history/models.py b/simple_history/models.py
@@ -149,9 +149,9 @@ def revert_url(self):
             """URL for this change in the default admin site."""
             opts = model._meta
             try:
-                app_label, model_name = opts.app_label, opts.module_name
-            except AttributeError:
                 app_label, model_name = opts.app_label, opts.model_name
+            except AttributeError:
+                app_label, model_name = opts.app_label, opts.module_name
             return ('%s:%s_%s_simple_history' %
                     (admin.site.name, app_label, model_name),
                     [getattr(self, opts.pk.attname), self.history_id])