fixing django 1.7 errors

djadmin2/tests/test_renderers.py

@@ -57,16 +57,16 @@ class DatetimeRendererTest(TestCase):
 
     def test_time_german(self):
         activate('de')
-        out = self.renderer(dt.time(13, 37, 01), None)
+        out = self.renderer(dt.time(13, 37, 1), None)
         self.assertEqual('13:37:01', out)
 
     def test_time_chinese(self):
         activate('zh')
-        out = self.renderer(dt.time(13, 37, 01), None)
+        out = self.renderer(dt.time(13, 37, 1), None)
         self.assertEqual('1:37 p.m.', out)
 
     def test_datetime(self):
-        out = self.renderer(dt.datetime(2013, 7, 6, 13, 37, 01), None)
+        out = self.renderer(dt.datetime(2013, 7, 6, 13, 37, 1), None)
         self.assertEqual('July 6, 2013, 1:37 p.m.', out)
 
     # TODO test timezone localization

example/blog/tests/test_filters.py

@@ -12,33 +12,30 @@ import djadmin2.filters as djadmin2_filters
 
 import django_filters
 
-
-class PostAdminSimple(djadmin2.ModelAdmin2):
-    list_filter = ['published', ]
-
-
-class PostAdminWithFilterInstances(djadmin2.ModelAdmin2):
-    list_filter = [
-        django_filters.BooleanFilter(name='published'),
-    ]
-
-
-class FS(django_filters.FilterSet):
-    class Meta:
-        model = Post
-        fields = ['published']
-
-
-class PostAdminWithFilterSetInst(djadmin2.ModelAdmin2):
-    list_filter = FS
-
-
 class ListFilterBuilderTest(TestCase):
 
     def setUp(self):
         self.rf = RequestFactory()
 
     def test_filter_building(self):
+        class PostAdminSimple(djadmin2.ModelAdmin2):
+            list_filter = ['published', ]
+
+
+        class PostAdminWithFilterInstances(djadmin2.ModelAdmin2):
+            list_filter = [
+                django_filters.BooleanFilter(name='published'),
+            ]
+
+        class FS(django_filters.FilterSet):
+            class Meta:
+                model = Post
+                fields = ['published']
+
+
+        class PostAdminWithFilterSetInst(djadmin2.ModelAdmin2):
+            list_filter = FS
+
         Post.objects.create(title="post_1_title", body="body")
         Post.objects.create(title="post_2_title", body="another body")
         request = self.rf.get(reverse("admin2:dashboard"))

example/files/tests/test_views.py

@@ -69,7 +69,7 @@ class CaptionedFileDetailViewTest(BaseIntegrationTest):
 class CaptionedFileCreateViewTest(BaseIntegrationTest):
     def test_view_ok(self):
         response = self.client.get(reverse("admin2:files_captionedfile_create"))
-        self.assertIn('''enctype="multipart/form-data"''', response.content)
+        self.assertIn('enctype="multipart/form-data"', response.content)
         self.assertEqual(response.status_code, 200)
 
     def test_create_captioned_file(self):

example/polls/tests/__init__.py

@@ -1,2 +0,0 @@
-from test_models import *
-from test_views import *

setup.py

@@ -132,7 +132,7 @@ setup(
         'django-braces>=1.3.0',
         'djangorestframework>=2.3.3',
         'django-floppyforms>=1.1',
-        'django-filter>=0.6',
+        'django-filter>=0.7',
         'django-crispy-forms>=1.3.2',
         'pytz==2014.7'
         ],

tox.ini

@@ -11,7 +11,7 @@ deps =
      django-braces>=1.3.0
      djangorestframework>=2.3.3
      django-floppyforms>=1.1
-     django-filter>=0.6
+     django-filter>=0.7
      django-crispy-forms>=1.3.2
      django-debug-toolbar>=0.9.4
      pytest