Revert feature regressions for 1.7

@aaugustin 1.7 bugs should be apparent now

simple_history/models.py

@@ -91,7 +91,7 @@ def create_history_model(self, model):
         if model.__module__ != self.module:
             # registered under different app
             attrs['__module__'] = self.module
-        elif django_version < (1, 7, 0) and app_module != self.module:
+        elif app_module != self.module:
             # has meta options with app_label
             app = models.get_app(model._meta.app_label)  # FIXME This is broken in 1.7
             attrs['__module__'] = app.__name__  # full dotted name
@@ -173,12 +173,7 @@ def get_meta_options(self, model):
         if self.user_set_verbose_name:
             name = self.user_set_verbose_name
         else:
-            try:
-                name = 'historical ' + text_type(model._meta.verbose_name)
-            except RuntimeError:
-                # Django 1.7 app registry makes this impossible
-                from django.utils.text import camel_case_to_spaces
-                name = camel_case_to_spaces(model.__name__)
+            name = 'historical ' + text_type(model._meta.verbose_name)
         meta_fields['verbose_name'] = name
         return meta_fields
 

simple_history/tests/tests.py

@@ -1,8 +1,4 @@
 from __future__ import unicode_literals
-try:
-    from unittest import skipUnless
-except ImportError:  # Python 2.6
-    from django.utils.unittest import skipUnless
 
 from datetime import datetime, timedelta
 from django import VERSION
@@ -313,7 +309,6 @@ class AppLabelTest(TestCase):
     def get_table_name(self, manager):
         return manager.model._meta.db_table
 
-    @skipUnless(VERSION < (1, 7, 0), "this feature is broken in 1.7")
     def test_explicit_app_label(self):
         self.assertEqual(self.get_table_name(ExternalModel1.objects),
                          'external_externalmodel1')