Merge pull request #400 from ocefpaf/drop_2to3

Drop 2to3 in setup.py

Author: WeatherGod

lib/mpl_toolkits/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 try:
     __import__('pkg_resources').declare_namespace(__name__)
 except ImportError:

lib/mpl_toolkits/basemap/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 """
 Module for plotting data on maps with matplotlib.
 
@@ -13,6 +15,13 @@
 :func:`addcyclic`: Add cyclic (wraparound) point in longitude.
 """
 from distutils.version import LooseVersion
+
+try:
+    from urllib import urlretrieve
+    from urllib2 import urlopen
+except ImportError:
+    from urllib.request import urlretrieve, urlopen
+
 from matplotlib import __version__ as _matplotlib_version
 from matplotlib.cbook import is_scalar, dedent
 # check to make sure matplotlib is not too old.
@@ -4051,7 +4060,6 @@ def warpimage(self,image="bluemarble",scale=None,**kwargs):
         else:
             newfile = False
         if file.startswith('http'):
-            from urllib import urlretrieve
             self._bm_file, headers = urlretrieve(file)
         else:
             self._bm_file = file
@@ -4211,7 +4219,6 @@ def arcgisimage(self,server='http://server.arcgisonline.com/ArcGIS',\
 
         returns a matplotlib.image.AxesImage instance.
         """
-        import urllib2
         if not hasattr(self,'epsg'):
             msg = dedent("""
             Basemap instance must be creating using an EPSG code
@@ -4250,9 +4257,9 @@ def arcgisimage(self,server='http://server.arcgisonline.com/ArcGIS',\
 f=image" %\
 (server,service,xmin,ymin,xmax,ymax,self.epsg,self.epsg,xpixels,ypixels,dpi)
         # print URL?
-        if verbose: print basemap_url
+        if verbose: print(basemap_url)
         # return AxesImage instance.
-        return self.imshow(imread(urllib2.urlopen(basemap_url)),ax=ax,
+        return self.imshow(imread(urlopen(basemap_url)),ax=ax,
                            origin='upper')
 
     def wmsimage(self,server,\
@@ -4297,7 +4304,7 @@ def wmsimage(self,server,\
             from owslib.wms import WebMapService
         except ImportError:
             raise ImportError('OWSLib required to use wmsimage method')
-        import urllib2, io
+        import io
         ax = kwargs.pop('ax', None) or self._check_ax()
         if not hasattr(self,'epsg'):
             msg = dedent("""
@@ -4325,17 +4332,17 @@ def wmsimage(self,server,\
         # ypixels not given, find by scaling xpixels by the map aspect ratio.
         if ypixels is None:
             ypixels = int(self.aspect*xpixels)
-        if verbose: print server
+        if verbose: print(server)
         wms = WebMapService(server)
         if verbose:
-            print 'id: %s, version: %s' %\
-            (wms.identification.type,wms.identification.version)
-            print 'title: %s, abstract: %s' %\
-            (wms.identification.title,wms.identification.abstract)
-            print 'available layers:'
-            print list(wms.contents)
-            print 'projection options:'
-            print wms[kwargs['layers'][0]].crsOptions
+            print('id: %s, version: %s' %
+            (wms.identification.type,wms.identification.version))
+            print('title: %s, abstract: %s' %
+            (wms.identification.title,wms.identification.abstract))
+            print('available layers:')
+            print(list(wms.contents))
+            print('projection options:')
+            print(wms[kwargs['layers'][0]].crsOptions)
         # remove keys from kwargs that are over-ridden
         for k in ['format','bbox','service','size','srs']:
             if 'format' in kwargs: del kwargs['format']
@@ -4346,8 +4353,6 @@ def wmsimage(self,server,\
         # this works for png and jpeg.
         return self.imshow(imread(io.BytesIO(img.read()),
                            format=format),origin='upper',alpha=alpha,ax=ax)
-        # this works for png, but not jpeg
-        #return self.imshow(imread(urllib2.urlopen(img.url),format=format),origin='upper')
 
     def drawmapscale(self,lon,lat,lon0,lat0,length,barstyle='simple',\
                      units='km',fontsize=9,yoffset=None,labelstyle='simple',\
@@ -5095,7 +5100,7 @@ def _addcyclic_lon(a):
     if len(arr) == 1:
         return _addcyclic_lon(arr[-1])
     else:
-        return map(_addcyclic,arr[:-1]) + [_addcyclic_lon(arr[-1])]
+        return list(map(_addcyclic,arr[:-1]) + [_addcyclic_lon(arr[-1])])
 
 def _choosecorners(width,height,**kwargs):
     """

lib/mpl_toolkits/basemap/cm.py

@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 """
 extra colormaps:
 
@@ -11,6 +13,8 @@
 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']
 
@@ -70,7 +74,7 @@
 
 def _revcmap(data):
     data_r = {}
-    for key,val in data.iteritems():
+    for key,val in iteritems(data):
         val = list(val)
         valrev = val[::-1]
         valnew = []
@@ -79,7 +83,7 @@ def _revcmap(data):
         data_r[key]=valnew
     return data_r
 
-_cmapnames = datad.keys()
+_cmapnames = list(datad.keys())
 for _cmapname in _cmapnames:
     _cmapname_r = _cmapname+'_r'
     _cmapdat_r = _revcmap(datad[_cmapname])

lib/mpl_toolkits/basemap/diagnostic.py

@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 """
 These are diagnostic and debugging functions for basemap.
 """

lib/mpl_toolkits/basemap/proj.py

@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 import numpy as np
 import pyproj
 import math

lib/mpl_toolkits/basemap/solar.py

@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # some simple functions to calculate solar position, day-night terminator
 import numpy as np
 from numpy import ma

lib/mpl_toolkits/basemap/test.py

@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from distutils.version import LooseVersion
 import sys
 from mpl_toolkits.basemap import Basemap, shiftgrid

requirements.txt

@@ -1,2 +1,3 @@
 pyproj>=1.9.3
 pyshp>=1.2.0
+six

setup.py

@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 import sys, glob, os, subprocess
 
 if sys.version_info < (2, 6):
@@ -20,10 +22,6 @@
     # append numpy include dir.
     inc_dirs.append(numpy.get_include())
 
-try:
-    from distutils.command.build_py import build_py_2to3 as build_py
-except ImportError:
-    from distutils.command.build_py import build_py
 
 def checkversion(GEOS_dir):
     """check geos C-API header file (geos_c.h)"""
@@ -112,7 +110,8 @@ def checkversion(GEOS_dir):
   "numpy>=1.2.1", 
   "matplotlib>=1.0.0",
   "pyproj >= 1.9.3", 
-  "pyshp >= 1.2.0"
+  "pyshp >= 1.2.0",
+  "six",
 ]
 
 __version__ = "1.1.0"
@@ -147,6 +146,5 @@ def checkversion(GEOS_dir):
   namespace_packages = namespace_packages,
   package_dir       = package_dirs,
   ext_modules       = extensions,   
-  cmdclass = {'build_py': build_py},
   package_data = package_data
   )