Remove dependency on six

molinav · molinav · commit 2d216f44d999 · 2022-03-14T20:11:34.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,9 @@ https://semver.org/spec/v2.0.0.html
 
 ## [Unreleased]
 
+### Removed
+- Remove dependency on `six` (solves issue [#536]).
+
 ## [1.3.2] - 2022-02-10
 
 ### Added
@@ -889,6 +892,8 @@ https://semver.org/spec/v2.0.0.html
 - Fix glitches in drawing of parallels and meridians.
 
 
+[#536]:
+https://github.com/matplotlib/basemap/issues/536
 [#533]:
 https://github.com/matplotlib/basemap/issues/533
 [#532]:
diff --git a/README.md b/README.md
@@ -12,7 +12,6 @@ Basic requirements are the following:
 * [numpy](https://github.com/numpy/numpy)
 * [pyproj](https://github.com/pyproj4/pyproj)
 * [pyshp](https://github.com/GeospatialPython/pyshp)
-* [six](https://github.com/benjaminp/six)
 
 Optional requirements include:
 
diff --git a/packages/basemap/.pylintrc b/packages/basemap/.pylintrc
@@ -413,8 +413,7 @@ init-import=no
 
 # List of qualified module names which can have objects that can redefine
 # builtins.
-redefining-builtins-modules=six.moves,
-                            past.builtins,
+redefining-builtins-modules=past.builtins,
                             future.builtins,
                             builtins,
                             io
diff --git a/packages/basemap/requirements.txt b/packages/basemap/requirements.txt
@@ -1,7 +1,5 @@
 basemap_data >= 1.3, < 1.4
 
-six >= 1.10, < 1.16
-
 numpy >= 1.11, < 1.12; python_version == "2.6"
 numpy >= 1.16, < 1.17; python_version == "2.7"
 numpy >= 1.11, < 1.12; python_version == "3.2"
diff --git a/packages/basemap/src/mpl_toolkits/basemap/cm.py b/packages/basemap/src/mpl_toolkits/basemap/cm.py
@@ -14,8 +14,6 @@
 Run `examples/show_colormaps.py` to see what these colormaps look like.
 """
 
-from six import iteritems
-
 from matplotlib import rcParams, colors
 _LUTSIZE = rcParams['image.lut']
 
@@ -76,7 +74,7 @@
 def _revcmap(data):
 
     data_r = {}
-    for key, val in iteritems(data):
+    for key, val in data.items():
         val = list(val)
         valrev = val[::-1]
         valnew = []
