Address flake8 requirement

Author: smartlixx

lib/cartopy/data/raster/etopo1.jpg

@@ -41,6 +41,7 @@
 import cartopy.mpl.patch as cpatch
 from cartopy.mpl.slippy_image_artist import SlippyImageArtist
 from cartopy.vector_transform import vector_scalar_to_grid
+from cartopy.io import Downloader
 
 
 assert mpl.__version__ >= '1.5.1', ('Cartopy is only supported with '
@@ -1005,11 +1006,13 @@ def stock_img(self, name='ne_shaded'):
         """
         Add a standard image to the map.
 
-        Currently, there are 2 options. 
-        1: 'ne_shaded'(default) a downsampled version of the Natural Earth shaded relief raster.
-        2: 'etopo1' a downsampled version of global relief model of Earth's surface that
-        integrates land topography and ocean bathymetry. This option is the same as the etopo1 
-        from Basemap.
+        Currently, there are 2 options:
+
+        1. 'ne_shaded'(default) a downsampled version of the Natural Earth
+           shaded relief raster.
+        2. 'etopo' a downsampled version of global relief model of Earth's
+           surface that integrates land topography and ocean bathymetry. This
+           option is the same as the etopo from Basemap.
         """
         if name == 'ne_shaded':
             import os
@@ -1021,11 +1024,15 @@ def stock_img(self, name='ne_shaded'):
             return self.imshow(imread(fname), origin='upper',
                                transform=source_proj,
                                extent=[-180, 180, -90, 90])
-        elif name == 'etopo1':
+        elif name == 'etopo':
             import os
             source_proj = ccrs.PlateCarree()
-            fname = os.path.join(config["repo_data_dir"],
-                                 'raster', 'etopo1.jpg')
+
+            url_template = 'https://www.ngdc.noaa.gov/mgg/image/{name}.jpg'
+            target_path_template = os.path.join(config["data_dir"],
+                                                'raster', '{name}.jpg')
+            d = Downloader(url_template, target_path_template)
+            fname = d.path({'name': 'color_etopo1_ice_low'})
 
             return self.imshow(imread(fname), origin='upper',
                                transform=source_proj,

lib/cartopy/mpl/geoaxes.py

@@ -183,9 +183,9 @@ def test_stock_img():
                    reason='Proj Orthographic projection is buggy.',
                    strict=True)
 @ImageTesting(['imshow_etopo1_ortho'], tolerance=0.7)
-def test_stock_img_etopo1():
+def test_stock_img_etopo():
     ax = plt.axes(projection=ccrs.Orthographic())
-    ax.stock_img(name='etopo1')
+    ax.stock_img(name='etopo')
 
 
 @pytest.mark.xfail((5, 0, 0) <= ccrs.PROJ4_VERSION < (5, 1, 0),