Removed six dependencies.

Author: yellowcap

raster/algebra/parser.py

@@ -8,7 +8,6 @@
 from pyparsing import Forward, Keyword, Literal, Optional, Regex, Word, ZeroOrMore, alphanums, delimitedList, oneOf
 
 from django.contrib.gis.gdal import GDALRaster
-from django.utils import six
 from raster.algebra import const
 from raster.exceptions import RasterAlgebraException
 
@@ -121,10 +120,10 @@ def evaluate_stack(self, stack):
             op2 = self.evaluate_stack(stack)
             op1 = self.evaluate_stack(stack)
             # Handle null case
-            if isinstance(op1, six.string_types) and op1 == const.NULL:
+            if isinstance(op1, str) and op1 == const.NULL:
                 op2 = self.get_mask(op2, op)
                 op1 = True
-            elif isinstance(op2, six.string_types) and op2 == const.NULL:
+            elif isinstance(op2, str) and op2 == const.NULL:
                 op1 = self.get_mask(op1, op)
                 op2 = True
             return const.OPERATOR_MAP[op](op1, op2)

raster/tiles/parser.py

@@ -6,6 +6,8 @@
 import tempfile
 import uuid
 import zipfile
+from urllib.parse import urlparse
+from urllib.request import urlretrieve
 
 import boto3
 import numpy
@@ -15,8 +17,6 @@
 from django.contrib.gis.gdal.error import GDALException
 from django.core.files import File
 from django.dispatch import Signal
-from django.utils.six.moves.urllib.parse import urlparse
-from django.utils.six.moves.urllib.request import urlretrieve
 from raster.exceptions import RasterException
 from raster.models import RasterLayer, RasterLayerBandMetadata, RasterLayerReprojected, RasterTile
 from raster.tiles import utils

raster/utils.py

@@ -4,7 +4,6 @@
 from PIL import Image
 
 from django.contrib.gis.gdal import OGRGeometry
-from django.utils import six
 from raster.algebra.parser import FormulaParser
 from raster.exceptions import RasterException
 
@@ -127,9 +126,9 @@ def colormap_to_rgba(colormap):
     Convert color ma to rgba colors.
     """
     if 'continuous' in colormap:
-        return {k: hex_to_rgba(v) if isinstance(v, (six.string_types, int)) and k in ['from', 'to', 'over'] else v for k, v in colormap.items()}
+        return {k: hex_to_rgba(v) if isinstance(v, (str, int)) and k in ['from', 'to', 'over'] else v for k, v in colormap.items()}
     else:
-        return {k: hex_to_rgba(v) if isinstance(v, (six.string_types, int)) else v for k, v in colormap.items()}
+        return {k: hex_to_rgba(v) if isinstance(v, (str, int)) else v for k, v in colormap.items()}
 
 
 def pixel_value_from_point(raster, point, band=0):