Pep and Lint

safe/impact_functions/inundation/flood_population_evacuation_polygon_hazard.py

@@ -6,8 +6,6 @@
 from safe.common.utilities import ugettext as _
 from safe.common.tables import Table, TableRow
 
-from safe.storage.interpolation import interpolate_polygon_raster
-
 
 class FloodEvacuationFunctionVectorHazard(FunctionProvider):
     """Risk plugin for flood evacuation

safe/storage/interpolation.py

@@ -20,12 +20,11 @@
 from utilities import DEFAULT_ATTRIBUTE
 
 
-
 # FIXME (Ole): Not finished (issue #101)
-
 # FIXME: Add mode parameter too
 def assign_hazard_values_to_exposure_data(hazard, exposure,
-                                          layer_name=None, attribute_name=None):
+                                          layer_name=None,
+                                          attribute_name=None):
     """Assign hazard values to exposure data
 
     This is the high level wrapper around interpolation functions for different
@@ -35,7 +34,8 @@ def assign_hazard_values_to_exposure_data(hazard, exposure,
        hazard: Layer representing the hazard levels
        exposure: Layer representing the exposure data
        layer_name: Optional name of returned layer.
-          If None (default) the name of the exposure layer is used for the returned layer.
+          If None (default) the name of the exposure layer is used for
+          the returned layer.
        attribute_name: Name for new attribute if one needs to be created.
           If None (default) the name of hazard is used
 
@@ -67,11 +67,14 @@ def assign_hazard_values_to_exposure_data(hazard, exposure,
 
     with the following methodologies used:
 
-    Polygon-Point:   Clip points to polygon and assign polygon attributes to them.
+    Polygon-Point:   Clip points to polygon and assign polygon attributes
+       to them.
     Polygon-Line:    * Not Implemented *
     Polygon-Polygon: * Not Implemented *
-    Polygon-Raster:  Convert raster to points, clip to polygon, assign values and return point data
-    Raster-Point:    Bilinear (or constant) interpolation as currently implemented
+    Polygon-Raster:  Convert raster to points, clip to polygon, assign values
+       and return point data
+    Raster-Point:    Bilinear (or constant) interpolation as currently
+       implemented
     Raster-Line:     * Not Implemented *
     Raster-Polygon:  Calculate centroids and use Raster - Point algorithm
     Raster-Raster:   Exposure raster is returned as is

safe/storage/vector.py

@@ -23,6 +23,7 @@
 from safe.common.dynamic_translations import names as internationalised_titles
 from safe.common.exceptions import ReadLayerError, WriteLayerError
 from safe.common.exceptions import GetDataError, InaSAFEError
+from safe.common.utilities import ugettext as _
 
 from layer import Layer
 from projection import Projection
@@ -293,7 +294,7 @@ def read_from_file(self, filename):
         * http://www.packtpub.com/article/geospatial-data-python-geometry
         """
 
-        basename, _ = os.path.splitext(filename)
+        basename = os.path.splitext(filename)[0]
 
         # Look for any keywords
         self.keywords = read_keywords(basename + '.keywords')
@@ -770,7 +771,7 @@ def get_topN(self, attribute, N=10):
         A.sort()
 
         # Pick top N and unpack
-        _, data, geometry = zip(*A[-N:])
+        data, geometry = zip(*A[-N:])[1:]
 
         # Create new Vector instance and return
         return Vector(data=data,
@@ -868,7 +869,10 @@ def convert_line_to_points(V, delta):
     for i in range(N):
         c = points_along_line(geometry[i], delta)
         # We need to create a data entry for each point.
+        # FIXME (Ole): What on earth is this?
+        # pylint: disable=W0621
         new_data.extend([data[i] for _ in c])
+        # pylint: enable=W0621
         points.extend(c)
 
     # Create new point vector layer with same attributes and return