From a88cc7efba4a564cb4e45629a0d15c0ed975915a Mon Sep 17 00:00:00 2001 From: Tom Viner Date: Thu, 4 Jan 2018 14:32:13 +0000 Subject: [PATCH 1/2] add standard_library.install_aliases() calls --- django_qbe/exports.py | 6 +++--- django_qbe/forms.py | 3 +++ django_qbe/operators.py | 3 +++ django_qbe/savedqueries/models.py | 3 +++ django_qbe/templatetags/qbe_tags.py | 3 +++ django_qbe/utils.py | 3 +++ django_qbe/widgets.py | 5 ++++- setup.py | 2 +- 8 files changed, 23 insertions(+), 5 deletions(-) diff --git a/django_qbe/exports.py b/django_qbe/exports.py index b00c23f..2880234 100644 --- a/django_qbe/exports.py +++ b/django_qbe/exports.py @@ -1,4 +1,7 @@ # -*- coding: utf-8 -*- +from future import standard_library +standard_library.install_aliases() + import csv import six from builtins import object, str @@ -7,11 +10,8 @@ import six from collections import OrderedDict as SortedDict from django.http import StreamingHttpResponse -from future import standard_library from io import StringIO, BytesIO -standard_library.install_aliases() - __all__ = ("formats", ) diff --git a/django_qbe/forms.py b/django_qbe/forms.py index 2e88c2e..6dbb496 100644 --- a/django_qbe/forms.py +++ b/django_qbe/forms.py @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import print_function +from future import standard_library +standard_library.install_aliases() + from builtins import range import collections from django import forms diff --git a/django_qbe/operators.py b/django_qbe/operators.py index 785316b..935bee3 100644 --- a/django_qbe/operators.py +++ b/django_qbe/operators.py @@ -1,3 +1,6 @@ +from future import standard_library +standard_library.install_aliases() + from builtins import object from django.conf import settings from django.db import connections diff --git a/django_qbe/savedqueries/models.py b/django_qbe/savedqueries/models.py index f0a5701..86ee1bd 100644 --- a/django_qbe/savedqueries/models.py +++ b/django_qbe/savedqueries/models.py @@ -1,3 +1,6 @@ +from future import standard_library +standard_library.install_aliases() + from builtins import object import pickle from django.db import models diff --git a/django_qbe/templatetags/qbe_tags.py b/django_qbe/templatetags/qbe_tags.py index 1c62cf7..77a7b75 100644 --- a/django_qbe/templatetags/qbe_tags.py +++ b/django_qbe/templatetags/qbe_tags.py @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import division +from future import standard_library +standard_library.install_aliases() + from builtins import range from past.utils import old_div from django import template diff --git a/django_qbe/utils.py b/django_qbe/utils.py index ec21a67..c70f308 100644 --- a/django_qbe/utils.py +++ b/django_qbe/utils.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- from __future__ import print_function from __future__ import division +from future import standard_library +standard_library.install_aliases() + from past.builtins import cmp from builtins import zip from builtins import filter diff --git a/django_qbe/widgets.py b/django_qbe/widgets.py index 0d6d3e5..f8df276 100644 --- a/django_qbe/widgets.py +++ b/django_qbe/widgets.py @@ -1,5 +1,8 @@ -from builtins import object # -*- coding: utf-8 -*- +from future import standard_library +standard_library.install_aliases() + +from builtins import object from django.forms.utils import flatatt from django.forms.widgets import MultiWidget, Select, TextInput, Widget from django.utils.safestring import mark_safe diff --git a/setup.py b/setup.py index 31ec780..926437f 100644 --- a/setup.py +++ b/setup.py @@ -40,5 +40,5 @@ def find_version(*parts): zip_safe=False, packages=find_packages(), include_package_data=True, - install_requires=['django-picklefield'], + install_requires=['django-picklefield', 'future'], ) From b2094cd91688db5739cf1fb94816d6f9c3bcb3ee Mon Sep 17 00:00:00 2001 From: Tom Viner Date: Thu, 4 Jan 2018 14:43:21 +0000 Subject: [PATCH 2/2] Django 1.9 moves dj.contrib.admin.util -> utils --- django_qbe/savedqueries/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_qbe/savedqueries/admin.py b/django_qbe/savedqueries/admin.py index 7123d93..30e4f2e 100644 --- a/django_qbe/savedqueries/admin.py +++ b/django_qbe/savedqueries/admin.py @@ -1,7 +1,7 @@ from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _ from django.contrib import admin -from django.contrib.admin.util import unquote +from django.contrib.admin.utils import unquote try: from django.conf.urls import patterns, url except ImportError: