Style changes for new flake8 version

Author: jgaff

mdf_forge/forge.py

@@ -106,10 +106,9 @@ def transfer_client(self):
     def mdf_authorizer(self):
         return self.__data_mdf_authorizer
 
-
-# ***********************************************
-# * Core functions
-# ***********************************************
+    # ***********************************************
+    # * Core functions
+    # ***********************************************
 
     def match_field(self, field, value, required=True, new_group=False):
         """Add a field:value term to the query.
@@ -280,10 +279,9 @@ def reset_query(self):
         del self.__query
         self.__query = Query(self.__search_client)
 
-
-# ***********************************************
-# * Expanded functions
-# ***********************************************
+    # ***********************************************
+    # * Expanded functions
+    # ***********************************************
 
     def match_range(self, field, start="*", stop="*", inclusive=True,
                     required=True, new_group=False):
@@ -365,10 +363,9 @@ def exclude_range(self, field, start="*", stop="*", inclusive=True,
         self.exclude_field(field, value, new_group=new_group)
         return self
 
-
-# ***********************************************
-# * Helper functions
-# ***********************************************
+    # ***********************************************
+    # * Helper functions
+    # ***********************************************
 
     def exclusive_match(self, field, value):
         """Match exactly the given value, with no other data in the field.
@@ -575,10 +572,9 @@ def match_resource_types(self, types):
             self.match_field(field="mdf.resource_type", value=rt, required=False, new_group=False)
         return self
 
-
-# ***********************************************
-# * Premade searches
-# ***********************************************
+    # ***********************************************
+    # * Premade searches
+    # ***********************************************
 
     def search_by_elements(self, elements, source_names=[], index=None, limit=None,
                            match_all=True, info=False):
@@ -718,10 +714,9 @@ def get_dataset_version(self, source_name):
         else:
             return hits[0]['mdf']['version']
 
-
-# ***********************************************
-# * Data retrieval functions
-# ***********************************************
+    # ***********************************************
+    # * Data retrieval functions
+    # ***********************************************
 
     def http_download(self, results, dest=".", preserve_dir=False, verbose=True):
         """Download data files from the provided results using HTTPS.
@@ -799,23 +794,18 @@ def http_download(self, results, dest=".", preserve_dir=False, verbose=True):
                         # Check if file already exists, change filename if necessary
                         collisions = 0
                         while os.path.exists(local_path):
-                            # Find period marking extension, if exists
-                            # Will be after last slash
-                            last_slash = local_path.rfind("/")
-                            index = local_path.rfind(".", (last_slash if last_slash != -1 else 0))
-                            if index < 0:
-                                ext = ""
-                            else:
-                                ext = local_path[index:]
-                                local_path = local_path[:index]
+                            # Save and remove extension
+                            local_path, ext = os.path.splitext(local_path)
                             # Check if already added number to end
                             old_add = "("+str(collisions)+")"
                             collisions += 1
                             new_add = "("+str(collisions)+")"
+                            # Remove old number if exists
                             if local_path.endswith(old_add):
-                                local_path = local_path[:-len(old_add)] + new_add + ext
-                            else:
-                                local_path = local_path + new_add + ext
+                                local_path = local_path[:-len(old_add)]
+                            # Add new number
+                            local_path = local_path + new_add + ext
+
                         headers = {}
                         # Check for Petrel vs. NCSA url for authorizer
                         # Petrel