From: Stephen Finucane Date: Mon, 17 Sep 2018 13:56:36 +0000 (+0100) Subject: Remove '__future__.absolute_import' imports X-Git-Tag: v2.2.0-rc1~281 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14a152e9cbc4c0e74669c7fb781997041d2f11d6;p=thirdparty%2Fpatchwork.git Remove '__future__.absolute_import' imports These were added as part of the Python 3 support series but are not required and can be safely removed. Signed-off-by: Stephen Finucane --- diff --git a/patchwork/admin.py b/patchwork/admin.py index 133872ac..bab94a34 100644 --- a/patchwork/admin.py +++ b/patchwork/admin.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - from django.contrib import admin from django.contrib.auth.admin import UserAdmin as BaseUserAdmin from django.contrib.auth.models import User diff --git a/patchwork/fields.py b/patchwork/fields.py index 502558be..c10432b9 100644 --- a/patchwork/fields.py +++ b/patchwork/fields.py @@ -18,8 +18,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - import hashlib from django.db import models diff --git a/patchwork/filters.py b/patchwork/filters.py index 8d0f82f2..7b5db117 100644 --- a/patchwork/filters.py +++ b/patchwork/filters.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - from django.contrib.auth.models import User from django.utils.html import escape from django.utils.safestring import mark_safe diff --git a/patchwork/models.py b/patchwork/models.py index 8731bb2f..2bc026a0 100644 --- a/patchwork/models.py +++ b/patchwork/models.py @@ -18,8 +18,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - from collections import Counter from collections import OrderedDict import datetime diff --git a/patchwork/paginator.py b/patchwork/paginator.py index f565c420..1696cba5 100644 --- a/patchwork/paginator.py +++ b/patchwork/paginator.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - from django.conf import settings from django.core import paginator diff --git a/patchwork/settings/dev.py b/patchwork/settings/dev.py index 79148803..4bb5a93c 100644 --- a/patchwork/settings/dev.py +++ b/patchwork/settings/dev.py @@ -7,8 +7,6 @@ Design based on: http://www.revsys.com/blog/2014/nov/21/recommended-django-project-layout/ """ -from __future__ import absolute_import - from .base import * # noqa # diff --git a/patchwork/settings/production.example.py b/patchwork/settings/production.example.py index 0c7a88c0..f58896fc 100644 --- a/patchwork/settings/production.example.py +++ b/patchwork/settings/production.example.py @@ -7,8 +7,6 @@ Design based on: http://www.revsys.com/blog/2014/nov/21/recommended-django-project-layout/ """ -from __future__ import absolute_import - import os from .base import * # noqa diff --git a/patchwork/templatetags/listurl.py b/patchwork/templatetags/listurl.py index 76dae797..c987fb47 100644 --- a/patchwork/templatetags/listurl.py +++ b/patchwork/templatetags/listurl.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - from django.conf import settings from django import template from django.urls import reverse diff --git a/patchwork/templatetags/patch.py b/patchwork/templatetags/patch.py index 30ccc8e2..c5dbf255 100644 --- a/patchwork/templatetags/patch.py +++ b/patchwork/templatetags/patch.py @@ -18,8 +18,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - from django import template from django.utils.safestring import mark_safe from django.template.defaultfilters import stringfilter diff --git a/patchwork/templatetags/person.py b/patchwork/templatetags/person.py index 09c8d103..8036a77f 100644 --- a/patchwork/templatetags/person.py +++ b/patchwork/templatetags/person.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - from django import template from django.urls import reverse from django.utils.html import escape diff --git a/patchwork/templatetags/project.py b/patchwork/templatetags/project.py index 32d8011b..fa338959 100644 --- a/patchwork/templatetags/project.py +++ b/patchwork/templatetags/project.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - from django import template from django.utils.safestring import mark_safe diff --git a/patchwork/templatetags/syntax.py b/patchwork/templatetags/syntax.py index 27ff8c3a..78877401 100644 --- a/patchwork/templatetags/syntax.py +++ b/patchwork/templatetags/syntax.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - import re from django import template diff --git a/patchwork/tests/test_bundles.py b/patchwork/tests/test_bundles.py index 3fa556b0..bdeb549f 100644 --- a/patchwork/tests/test_bundles.py +++ b/patchwork/tests/test_bundles.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - import base64 import datetime import unittest diff --git a/patchwork/tests/test_completion.py b/patchwork/tests/test_completion.py index 8e769d4b..834d6498 100644 --- a/patchwork/tests/test_completion.py +++ b/patchwork/tests/test_completion.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - import json from django.test import TestCase diff --git a/patchwork/tests/test_detail.py b/patchwork/tests/test_detail.py index f119da05..8faec6cd 100644 --- a/patchwork/tests/test_detail.py +++ b/patchwork/tests/test_detail.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - from django.test import TestCase from django.urls import reverse diff --git a/patchwork/tests/test_list.py b/patchwork/tests/test_list.py index 867d77f6..64631878 100644 --- a/patchwork/tests/test_list.py +++ b/patchwork/tests/test_list.py @@ -17,8 +17,6 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import - from datetime import datetime as dt import re diff --git a/patchwork/views/xmlrpc.py b/patchwork/views/xmlrpc.py index b02a65b6..11e5c3a2 100644 --- a/patchwork/views/xmlrpc.py +++ b/patchwork/views/xmlrpc.py @@ -20,8 +20,6 @@ # Patchwork XMLRPC interface # -from __future__ import absolute_import - import base64 # NOTE(stephenfin) six does not seem to support this try: