Removed future unicode_literals imports.

yellowcap · yellowcap · commit adba9c79d44e · 2020-03-01T15:52:28.000Z
diff --git a/raster/admin.py b/raster/admin.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.contrib import admin, messages
 from django.http import HttpResponseRedirect
diff --git a/raster/algebra/const.py b/raster/algebra/const.py
@@ -1,8 +1,6 @@
 """
 Define all mappings between operators and string representations.
 """
-from __future__ import unicode_literals
-
 import numpy
 
 ALGEBRA_PIXEL_TYPE_GDAL = 7
diff --git a/raster/algebra/parser.py b/raster/algebra/parser.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import keyword
 import operator
 from functools import reduce
diff --git a/raster/const.py b/raster/const.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from PIL import ImageEnhance
 
 IMG_ENHANCEMENTS = {
diff --git a/raster/exceptions.py b/raster/exceptions.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.exceptions import SuspiciousOperation
 
 
diff --git a/raster/migrations/0001_initial.py b/raster/migrations/0001_initial.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.contrib.gis.db import models
 from django.db import migrations
 
diff --git a/raster/migrations/0002_auto_20140925_0723.py b/raster/migrations/0002_auto_20140925_0723.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0003_rastertile_level.py b/raster/migrations/0003_rastertile_level.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0004_rasterlayermetadata.py b/raster/migrations/0004_rasterlayermetadata.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0005_auto_20141014_0955.py b/raster/migrations/0005_auto_20141014_0955.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/raster/migrations/0006_auto_20141016_0522.py b/raster/migrations/0006_auto_20141016_0522.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0007_auto_20141017_0240.py b/raster/migrations/0007_auto_20141017_0240.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0008_auto_20150219_0413.py b/raster/migrations/0008_auto_20150219_0413.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import colorful.fields
 
 from django.db import migrations, models
diff --git a/raster/migrations/0009_rasterlayer_max_zoom.py b/raster/migrations/0009_rasterlayer_max_zoom.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0010_auto_20150429_1207.py b/raster/migrations/0010_auto_20150429_1207.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0011_auto_20150615_0800.py b/raster/migrations/0011_auto_20150615_0800.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.contrib.gis.db.models.fields
 from django.db import migrations
 
diff --git a/raster/migrations/0012_auto_20150616_0538.py b/raster/migrations/0012_auto_20150616_0538.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0013_remove_rasterlayer_max_zoom.py b/raster/migrations/0013_remove_rasterlayer_max_zoom.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/raster/migrations/0014_remove_rastertile_is_base.py b/raster/migrations/0014_remove_rastertile_is_base.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/raster/migrations/0015_auto_20150819_0320.py b/raster/migrations/0015_auto_20150819_0320.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import datetime
 
 from django.db import migrations, models
diff --git a/raster/migrations/0016_rasterlayermetadata_srid.py b/raster/migrations/0016_rasterlayermetadata_srid.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0017_copy_srids_20150922_0207.py b/raster/migrations/0017_copy_srids_20150922_0207.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/raster/migrations/0018_rasterlayermetadata_srs_wkt.py b/raster/migrations/0018_rasterlayermetadata_srs_wkt.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0019_remove_rasterlayer_srid.py b/raster/migrations/0019_remove_rasterlayer_srid.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/raster/migrations/0020_auto_20150928_0408.py b/raster/migrations/0020_auto_20150928_0408.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0021_rasterlayerparsestatus.py b/raster/migrations/0021_rasterlayerparsestatus.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9b1 on 2015-11-10 07:56
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.db import migrations, models
 
diff --git a/raster/migrations/0022_auto_20151110_0810.py b/raster/migrations/0022_auto_20151110_0810.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/raster/migrations/0023_remove_rasterlayer_parse_log.py b/raster/migrations/0023_remove_rasterlayer_parse_log.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9b1 on 2015-11-10 08:25
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/raster/migrations/0024_auto_20151111_0532.py b/raster/migrations/0024_auto_20151111_0532.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.contrib.postgres.fields
 from django.db import migrations, models
 
diff --git a/raster/migrations/0025_auto_20151113_0259.py b/raster/migrations/0025_auto_20151113_0259.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0026_auto_20151120_1334.py b/raster/migrations/0026_auto_20151120_1334.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/raster/migrations/0027_rasterlayerreprojected.py b/raster/migrations/0027_rasterlayerreprojected.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0028_auto_20160104_0533.py b/raster/migrations/0028_auto_20160104_0533.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.contrib.postgres.fields
 from django.db import migrations, models
 
diff --git a/raster/migrations/0029_auto_20160111_0646.py b/raster/migrations/0029_auto_20160111_0646.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0030_auto_20160111_0813.py b/raster/migrations/0030_auto_20160111_0813.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.contrib.postgres.fields
 from django.db import migrations, models
 
diff --git a/raster/migrations/0031_auto_20160218_0832.py b/raster/migrations/0031_auto_20160218_0832.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.3.dev20160204092059 on 2016-02-18 08:32
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0032_auto_20160426_0152.py b/raster/migrations/0032_auto_20160426_0152.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.5 on 2016-04-26 01:52
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0033_auto_20160510_1041.py b/raster/migrations/0033_auto_20160510_1041.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7.dev20160506141209 on 2016-05-10 10:41
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/migrations/0034_legendentryorder.py b/raster/migrations/0034_legendentryorder.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8.dev20160616122412 on 2016-07-01 04:22
-from __future__ import unicode_literals
-
 import json
 from operator import itemgetter
 
diff --git a/raster/migrations/0035_auto_20170509_0545.py b/raster/migrations/0035_auto_20170509_0545.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.2.dev20170508150049 on 2017-05-09 05:45
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.db import migrations, models
 
diff --git a/raster/migrations/0036_auto_20170509_0548.py b/raster/migrations/0036_auto_20170509_0548.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.2.dev20170508150049 on 2017-05-09 05:48
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/raster/migrations/0037_auto_20170509_0559.py b/raster/migrations/0037_auto_20170509_0559.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.2.dev20170508150049 on 2017-05-09 05:59
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/raster/migrations/0038_auto_20171116_1027.py b/raster/migrations/0038_auto_20171116_1027.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-11-16 10:27
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/raster/mixins.py b/raster/mixins.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.gis.geos import GEOSGeometry
 from django.db import connection
 from raster.tiles.const import WEB_MERCATOR_SRID
diff --git a/raster/models.py b/raster/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 import math
 from operator import itemgetter
diff --git a/raster/rasterize.py b/raster/rasterize.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from ctypes import POINTER, c_char_p, c_double, c_int, c_void_p
 
 import numpy
diff --git a/raster/shortcuts.py b/raster/shortcuts.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from raster.utils import colormap_to_rgba
 
 
diff --git a/raster/tasks.py b/raster/tasks.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import shutil
 import traceback
 
diff --git a/raster/tiles/parser.py b/raster/tiles/parser.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import fnmatch
 import os
diff --git a/raster/tiles/utils.py b/raster/tiles/utils.py
@@ -1,8 +1,6 @@
 """
 Everything required to create TMS tiles.
 """
-from __future__ import unicode_literals
-
 from django.conf import settings
 from raster.tiles.const import (
     GLOBAL_MAX_ZOOM_LEVEL, QUADRANT_SIZE, WEB_MERCATOR_TILESHIFT, WEB_MERCATOR_TILESIZE, WEB_MERCATOR_WORLDSIZE
diff --git a/raster/urls.py b/raster/urls.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 from raster.views import AlgebraView, ExportView, LegendView
 
diff --git a/raster/utils.py b/raster/utils.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import numpy
 from PIL import Image
 
diff --git a/raster/valuecount.py b/raster/valuecount.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from collections import Counter
 
 import numpy
diff --git a/raster/views.py b/raster/views.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import io
 import json
 import os
diff --git a/tests/models.py b/tests/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.gis.db import models
 
 
diff --git a/tests/raster_testcase.py b/tests/raster_testcase.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import inspect
 import os
 import shutil
diff --git a/tests/test_algebra.py b/tests/test_algebra.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 
 from django.contrib.gis.gdal import GDAL_VERSION, GDALRaster
diff --git a/tests/test_code_sanity.py b/tests/test_code_sanity.py
diff --git a/tests/test_export.py b/tests/test_export.py
diff --git a/tests/test_formula_parser.py b/tests/test_formula_parser.py
diff --git a/tests/test_histogram.py b/tests/test_histogram.py
diff --git a/tests/test_legend.py b/tests/test_legend.py
diff --git a/tests/test_legend_views.py b/tests/test_legend_views.py
diff --git a/tests/test_rasterize.py b/tests/test_rasterize.py
diff --git a/tests/test_rasterlayer_parser.py b/tests/test_rasterlayer_parser.py
diff --git a/tests/test_tms_views.py b/tests/test_tms_views.py
diff --git a/tests/test_utils.py b/tests/test_utils.py
diff --git a/tests/test_valuecount.py b/tests/test_valuecount.py
diff --git a/tests/testproj/celery.py b/tests/testproj/celery.py
diff --git a/tests/testproj/settings.py b/tests/testproj/settings.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import unicode_literals`
`2`		`-`
`3`	`1`	`from django import forms`
`4`	`2`	`from django.contrib import admin, messages`
`5`	`3`	`from django.http import HttpResponseRedirect`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import unicode_literals`
`2`		`-`
`3`	`1`	`import keyword`
`4`	`2`	`import operator`
`5`	`3`	`from functools import reduce`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import unicode_literals`
`2`		`-`
`3`	`1`	`from PIL import ImageEnhance`
`4`	`2`
`5`	`3`	`IMG_ENHANCEMENTS = {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import unicode_literals`
`2`		`-`
`3`	`1`	`from django.core.exceptions import SuspiciousOperation`
`4`	`2`
`5`	`3`