remove compat branching for older django versions

Author: Joshua Li

tests/sentry/api/endpoints/test_organization_searches.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-import django
 from django.utils import timezone
 from exam import fixture
 
@@ -24,10 +23,9 @@ def test_simple(self):
         project1 = self.create_project(teams=[team], name="foo")
         project2 = self.create_project(teams=[team], name="bar")
 
-        if django.VERSION[:2] >= (1, 8):
-            # Depending on test we run migrations in Django 1.8. This causes
-            # extra rows to be created, so remove them to keep this test working
-            SavedSearch.objects.filter(is_global=True).delete()
+        # Depending on test we run migrations in Django 1.8. This causes
+        # extra rows to be created, so remove them to keep this test working
+        SavedSearch.objects.filter(is_global=True).delete()
 
         SavedSearch.objects.create(
             project=project1, name="bar", query=DEFAULT_SAVED_SEARCHES[0]["query"]
@@ -71,10 +69,9 @@ def get_response(self, *args, **params):
         return super(OrgLevelOrganizationSearchesListTest, self).get_response(*args, **params)
 
     def create_base_data(self):
-        if django.VERSION[:2] >= (1, 8):
-            # Depending on test we run migrations in Django 1.8. This causes
-            # extra rows to be created, so remove them to keep this test working
-            SavedSearch.objects.filter(is_global=True).delete()
+        # Depending on test we run migrations in Django 1.8. This causes
+        # extra rows to be created, so remove them to keep this test working
+        SavedSearch.objects.filter(is_global=True).delete()
 
         team = self.create_team(members=[self.user])
         SavedSearch.objects.create(

tests/sentry/api/endpoints/test_project_details.py

@@ -3,7 +3,6 @@
 import mock
 import six
 
-import django
 from django.core.urlresolvers import reverse
 
 from sentry.constants import RESERVED_PROJECT_SLUGS
@@ -82,9 +81,6 @@ def test_project_renamed_302(self):
             "foobar",
         )
         redirect_path = "/api/0/projects/%s/%s/" % (project.organization.slug, "foobar")
-        if django.VERSION < (1, 9):
-            # Django 1.9 no longer forcefully rewrites relative redirects to absolute URIs because of RFC 7231.
-            redirect_path = "http://testserver" + redirect_path
         # XXX: AttributeError: 'Response' object has no attribute 'url'
         # (this is with self.assertRedirects(response, ...))
         assert response["Location"] == redirect_path