Merge pull request #382 from cpelley/flakeall

rhattersley · rhattersley · commit 4b622305f9ef · 2013-03-01T03:56:45.000-08:00
Removed most redundant imports
diff --git a/docs/iris/example_code/graphics/COP_1d_plot.py b/docs/iris/example_code/graphics/COP_1d_plot.py
@@ -18,12 +18,9 @@
    New Study For Climate Modeling, Analyses, and Scenarios. Eos Trans. AGU, Vol 90, No. 21.
 
 """
-import os.path
-
 import numpy as np
 import matplotlib.pyplot as plt
 import iris
-import iris.coords as coords
 import iris.plot as iplt
 import iris.quickplot as qplt
 
diff --git a/docs/iris/example_code/graphics/SOI_filtering.py b/docs/iris/example_code/graphics/SOI_filtering.py
@@ -77,7 +77,7 @@ def main():
                                 weights=wgts84)
 
     # plot the SOI time series and both filtered versions
-    fig = plt.figure(figsize=(9, 4))
+    plt.figure(figsize=(9, 4))
     iplt.plot(soi, coords=['time'], color='0.7', linewidth=1., linestyle='-',
               alpha=1., label='no filter')
     iplt.plot(soi24, coords=['time'], color='b', linewidth=2., linestyle='-',
diff --git a/docs/iris/example_code/graphics/TEC.py b/docs/iris/example_code/graphics/TEC.py
@@ -13,7 +13,6 @@
 import numpy.ma as ma
 
 import iris
-import iris.plot as iplt
 import iris.quickplot as qplt
 
 
diff --git a/docs/iris/example_code/graphics/deriving_phenomena.py b/docs/iris/example_code/graphics/deriving_phenomena.py
@@ -9,7 +9,6 @@
 plot.
 
 """
-import itertools
 import matplotlib.pyplot as plt
 import matplotlib.ticker
 
diff --git a/docs/iris/example_code/graphics/global_map.py b/docs/iris/example_code/graphics/global_map.py
@@ -9,7 +9,6 @@
 import matplotlib.pyplot as plt
 
 import iris
-import iris.plot as iplt
 import iris.quickplot as qplt
 
 
diff --git a/docs/iris/example_code/graphics/rotated_pole_mapping.py b/docs/iris/example_code/graphics/rotated_pole_mapping.py
@@ -55,7 +55,7 @@ def main():
     
     # Plot #4: Block plot
     plt.figure()
-    ax = plt.axes(projection=ccrs.PlateCarree())
+    plt.axes(projection=ccrs.PlateCarree())
     iplt.pcolormesh(temperature)
     plt.gca().stock_img()
     plt.gca().coastlines()
diff --git a/docs/iris/src/sphinxext/gen_example_directory.py b/docs/iris/src/sphinxext/gen_example_directory.py
@@ -19,7 +19,6 @@
 """
 Generate the rst files for the examples
 """
-import glob
 import os
 import re
 import sys
diff --git a/docs/iris/src/sphinxext/gen_gallery.py b/docs/iris/src/sphinxext/gen_gallery.py
@@ -17,7 +17,7 @@
 {%% endblock %%}
 """
 
-import os, glob, re, sys, warnings
+import os, glob, re, warnings
 import matplotlib.image as image
 
 multiimage = re.compile('(.*)_\d\d')
diff --git a/docs/iris/src/sphinxext/gen_rst.py b/docs/iris/src/sphinxext/gen_rst.py
@@ -4,8 +4,6 @@
 """
 generate the rst files for the examples by iterating over the pylab examples
 """
-import os, glob
-
 import os
 import re
 import sys
diff --git a/docs/iris/src/sphinxext/plot_directive.py b/docs/iris/src/sphinxext/plot_directive.py
@@ -90,7 +90,6 @@
 import matplotlib.pyplot as plt
 import matplotlib.image as image
 from matplotlib import _pylab_helpers
-from matplotlib.sphinxext import only_directives
 
 
 class PlotWarning(Warning):
diff --git a/docs/iris/src/userguide/plotting_examples/1d_with_legend.py b/docs/iris/src/userguide/plotting_examples/1d_with_legend.py
@@ -2,7 +2,6 @@
 
 import iris
 import iris.plot as iplt
-import iris.quickplot as qplt
 
 
 fname = iris.sample_data_path('air_temp.pp')
diff --git a/lib/iris/_constraints.py b/lib/iris/_constraints.py
@@ -20,7 +20,6 @@
 """
 import collections
 import operator
-import warnings
 
 import numpy as np
 
diff --git a/lib/iris/_cube_coord_common.py b/lib/iris/_cube_coord_common.py
@@ -19,7 +19,6 @@
 # TODO: Is this a mixin or a base class?
 
 import string
-import warnings
 
 import iris.std_names
 import iris.unit
diff --git a/lib/iris/_merge.py b/lib/iris/_merge.py
@@ -20,7 +20,7 @@
 Typically the cube merge process is handled by :method:`iris.cube.CubeList.merge`.
 
 """
-from collections import namedtuple, Iterable
+from collections import namedtuple
 from copy import deepcopy
 
 import numpy as np
diff --git a/lib/iris/analysis/__init__.py b/lib/iris/analysis/__init__.py
@@ -30,7 +30,6 @@
 
 import collections
 from copy import deepcopy
-from functools import partial
 
 import numpy as np
 import numpy.ma as ma
diff --git a/lib/iris/analysis/interpolate.py b/lib/iris/analysis/interpolate.py
@@ -22,7 +22,6 @@
 """
 import collections
 import warnings
-from copy import deepcopy
 
 import numpy as np
 import numpy.ma as ma
diff --git a/lib/iris/analysis/trajectory.py b/lib/iris/analysis/trajectory.py
@@ -20,7 +20,6 @@
 """
 
 import math
-import warnings
 
 import numpy as np
 
diff --git a/lib/iris/aux_factory.py b/lib/iris/aux_factory.py
@@ -25,7 +25,7 @@
 
 import numpy as np
 
-from iris._cube_coord_common import CFVariableMixin, LimitedAttributeDict
+from iris._cube_coord_common import CFVariableMixin
 import iris.coords
 import iris.util
 
diff --git a/lib/iris/coord_categorisation.py b/lib/iris/coord_categorisation.py
@@ -314,7 +314,6 @@ def _custom_season_month_year_adjusts(seasons):
     month_year_adjusts = [None, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
     for season in seasons:
         months = _months_in_season(season)
-        m0 = months[-1]
         for month in filter(lambda m: m > months[-1], months):
             month_year_adjusts[month] = 1
     return month_year_adjusts
diff --git a/lib/iris/fileformats/dot.py b/lib/iris/fileformats/dot.py
@@ -21,7 +21,6 @@
 
 import os
 import subprocess
-import tempfile
 
 import iris
 import iris.util
diff --git a/lib/iris/fileformats/ff.py b/lib/iris/fileformats/ff.py
@@ -20,7 +20,6 @@
 """
 
 import os
-import warnings
 
 import numpy as np
 
diff --git a/lib/iris/fileformats/grib.py b/lib/iris/fileformats/grib.py
@@ -31,7 +31,6 @@
 import iris.proxy
 iris.proxy.apply_proxy('gribapi', globals())
 
-import iris.coords as coords
 import iris.coord_systems as coord_systems
 import iris.unit
 import grib_save_rules
diff --git a/lib/iris/fileformats/pp.py b/lib/iris/fileformats/pp.py
@@ -27,8 +27,6 @@
 import os
 import re
 import struct
-import sys
-import warnings
 
 import numpy as np
 import numpy.ma as ma
@@ -980,7 +978,7 @@ def save(self, file_handle):
         for name, pos in self.HEADER_DEFN:
             try:
                 header_elem = getattr(self, name)
-            except AttributeError, err:
+            except AttributeError:
                 raise AttributeError("PPField.save() could not find %s" % name)
             if pos[0] <= NUM_LONG_HEADERS - UM_TO_PP_HEADER_OFFSET:
                 index = slice(pos[0], pos[-1] + 1)
diff --git a/lib/iris/io/format_picker.py b/lib/iris/io/format_picker.py
@@ -51,7 +51,6 @@
 import collections
 import os
 import struct
-import re
 
 
 class FormatAgent(object):
diff --git a/lib/iris/plot.py b/lib/iris/plot.py
@@ -24,7 +24,6 @@
 
 import collections
 import datetime
-import warnings
 
 import matplotlib.axes
 import matplotlib.collections as mpl_collections
diff --git a/lib/iris/tests/__init__.py b/lib/iris/tests/__init__.py
@@ -32,7 +32,6 @@
 import logging
 import os
 import os.path
-import platform
 import re
 import shutil
 import StringIO
diff --git a/lib/iris/tests/stock.py b/lib/iris/tests/stock.py
@@ -20,7 +20,6 @@
 """
 
 import os.path
-import warnings
 
 import numpy as np
 import numpy.ma as ma
diff --git a/lib/iris/tests/test_analysis.py b/lib/iris/tests/test_analysis.py
@@ -21,8 +21,6 @@
 import iris.tests as tests
 
 import itertools
-import os
-import unittest
 import zlib
 
 import cartopy.crs as ccrs
diff --git a/lib/iris/tests/test_coord_api.py b/lib/iris/tests/test_coord_api.py
@@ -23,7 +23,6 @@
 
 import unittest
 from xml.dom.minidom import Document
-import os.path
 import logging
 
 import numpy as np
diff --git a/lib/iris/tests/test_ff.py b/lib/iris/tests/test_ff.py
@@ -24,10 +24,8 @@
 import iris.tests as tests
 
 import collections
-import os.path
 
 import mock
-import numpy as np
 
 import iris
 import iris.fileformats.ff as ff
diff --git a/lib/iris/tests/test_hybrid.py b/lib/iris/tests/test_hybrid.py
@@ -24,7 +24,6 @@
 import iris.tests as tests
 
 import warnings
-import zlib
 
 import numpy as np
 
diff --git a/lib/iris/tests/test_io_init.py b/lib/iris/tests/test_io_init.py
@@ -21,7 +21,6 @@
 # import iris tests first so that some things can be initialised before importing anything else
 import iris.tests as tests
 
-import os
 import unittest
 
 import iris.fileformats as iff
diff --git a/lib/iris/tests/test_load.py b/lib/iris/tests/test_load.py
@@ -22,7 +22,6 @@
 import iris.tests as tests
 
 import iris
-import iris.tests.stock as stock
 
 
 @iris.tests.skip_data
diff --git a/lib/iris/tests/test_merge.py b/lib/iris/tests/test_merge.py
@@ -27,7 +27,7 @@
 import iris
 import iris.cube
 import iris.exceptions
-from iris.coords import DimCoord, AuxCoord
+from iris.coords import DimCoord
 import iris.coords
 import iris.tests.stock
 
diff --git a/lib/iris/tests/test_nimrod.py b/lib/iris/tests/test_nimrod.py
@@ -25,7 +25,6 @@
 import cartopy.crs as ccrs
 
 import iris
-import iris.plot as iplt
 import iris.quickplot as qplt
 import iris.fileformats.nimrod_load_rules as nimrod_load_rules
 
diff --git a/lib/iris/tests/test_pp_cf.py b/lib/iris/tests/test_pp_cf.py
@@ -20,7 +20,6 @@
 import iris.tests as tests
 import iris.coords
 
-import glob
 import os
 import subprocess
 import types
diff --git a/lib/iris/tests/test_pp_stash.py b/lib/iris/tests/test_pp_stash.py
@@ -19,9 +19,6 @@
 # import iris tests first so that some things can be initialised before importing anything else
 import iris.tests as tests
 
-import os
-import sys
-
 import iris
 import iris.fileformats.pp
 import iris.io
diff --git a/lib/iris/tests/test_pp_to_cube.py b/lib/iris/tests/test_pp_to_cube.py
@@ -19,8 +19,6 @@
 # import iris tests first so that some things can be initialised before importing anything else
 import iris.tests as tests
 
-import warnings
-
 import os
 
 import iris
diff --git a/lib/iris/tests/test_quickplot.py b/lib/iris/tests/test_quickplot.py
@@ -21,10 +21,7 @@
 # import iris tests first so that some things can be initialised before importing anything else
 import iris.tests as tests
 
-import matplotlib.pyplot as plt
-
 import iris
-import iris.coords as coords
 import iris.plot as iplt
 import iris.quickplot as qplt
 import iris.tests.test_plot as test_plot
diff --git a/lib/iris/tests/test_rules.py b/lib/iris/tests/test_rules.py
@@ -21,7 +21,6 @@
 # import iris tests first so that some things can be initialised before importing anything else
 import iris.tests as tests
 
-import os
 import types
 
 from iris.aux_factory import HybridHeightFactory
diff --git a/tools/generate_std_names.py b/tools/generate_std_names.py
@@ -30,7 +30,6 @@
 
 import argparse
 import pprint
-import sys
 import xml.etree.ElementTree as ET
 
 
