Skip to content

Django 1.9 compa #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tomviner wants to merge 2 commits into from
Closed

Django 1.9 compa #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a88cc7e
add standard_library.install_aliases() calls
tomviner Jan 4, 2018
b2094cd
Django 1.9 moves dj.contrib.admin.util -> utils
tomviner Jan 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions django_qbe/exports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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", )

Expand Down
3 changes: 3 additions & 0 deletions django_qbe/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions django_qbe/operators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion django_qbe/savedqueries/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
3 changes: 3 additions & 0 deletions django_qbe/savedqueries/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
from future import standard_library
standard_library.install_aliases()

from builtins import object
import pickle
from django.db import models
Expand Down
3 changes: 3 additions & 0 deletions django_qbe/templatetags/qbe_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions django_qbe/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion django_qbe/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
)