Merge pull request #1406 from cguennou/pep8

Fix PEP8 issues from the landscape.io

sunpy/database/attrs.py

@@ -195,6 +195,7 @@ def _create(wlk, root, session):
         elif typ == 'path':
             path, inverted = value
             if inverted:
+                # pylint: disable=E711
                 query = query.filter(or_(
                     DatabaseEntry.path != path, DatabaseEntry.path == None))
             else:

sunpy/image/rescale.py

@@ -54,7 +54,7 @@ def resample(orig, dimensions, method='linear', center=False, minusone=False):
                                    "when calling resample.")
 
     #@note: will this be okay for integer (e.g. JPEG 2000) data?
-    if not orig.dtype in [np.float64, np.float32]:
+    if orig.dtype not in [np.float64, np.float32]:
         orig = orig.astype(np.float64)
 
     dimensions = np.asarray(dimensions, dtype=np.float64)

sunpy/instr/fermi.py

@@ -82,11 +82,11 @@ def download_weekly_pointing_file(date):
             urllib2.HTTPError
             exists = False
         #if the file exists then exit and retain this filepath
-        if exists == True:
+        if exists:
             break
 
     #if no matches at all were found, then the pointing file doesn't exist
-    if exists == False:
+    if not exists:
         raise ValueError('No Fermi pointing files found for given date!')
 
 

sunpy/instr/lyra.py

@@ -224,13 +224,13 @@ def _remove_lytaf_events(time, channels=None, artifacts=None,
     if not artifacts:
         raise ValueError("User has supplied no artifacts to remove.")
     if type(artifacts) is str:
-      artifacts = [artifacts]
+        artifacts = [artifacts]
     if not all(isinstance(artifact_type, str) for artifact_type in artifacts):
         raise TypeError("All elements in artifacts must in strings.")
     all_lytaf_event_types = get_lytaf_event_types(lytaf_path=lytaf_path,
                                                   print_event_types=False)
     for artifact in artifacts:
-        if not artifact in all_lytaf_event_types:
+        if artifact not in all_lytaf_event_types:
             print all_lytaf_event_types
             raise ValueError("{0} is not a valid artifact type. See above.".format(artifact))
     # Define outputs

sunpy/instr/rhessi.py

@@ -361,9 +361,9 @@ def backprojection(calibrated_event_list, pixel_size=(1.,1.) * u.arcsec, image_d
     if not isinstance(pixel_size, u.Quantity):
         raise ValueError("Must be astropy Quantity in arcseconds")
     try:
-       pixel_size = pixel_size.to(u.arcsec)
+        pixel_size = pixel_size.to(u.arcsec)
     except:
-       raise ValueError("'{0}' is not a valid pixel_size unit".format(pixel_size.unit))
+        raise ValueError("'{0}' is not a valid pixel_size unit".format(pixel_size.unit))
     if not (isinstance(image_dim, u.Quantity) and image_dim.unit == 'pix'):
         raise ValueError("Must be astropy Quantity in pixels")
     calibrated_event_list = sunpy.RHESSI_EVENT_LIST

sunpy/lightcurve/sources/eve.py

@@ -37,7 +37,7 @@ class EVELightCurve(LightCurve):
     def peek(self, column = None, **kwargs):
         figure = plt.figure()
         # Choose title if none was specified
-        if not kwargs.has_key("title") and column is None:
+        if "title" not in kwargs and column is None:
             if len(self.data.columns) > 1:
                 kwargs['title'] = 'EVE (1 minute data)'
             else:
@@ -51,7 +51,7 @@ def peek(self, column = None, **kwargs):
             self.plot(**kwargs)
         else:
             data = self.data[column]
-            if not kwargs.has_key("title"):
+            if "title" not in kwargs:
                 kwargs['title'] = 'EVE ' + column.replace('_', ' ')
             data.plot(**kwargs)
         figure.show()