fix string condition, move bounded-wannabe method as function

Author: anibalsolon

nipype/interfaces/io.py

@@ -123,6 +123,35 @@ def add_traits(base, names, trait_type=None):
     return base
 
 
+def get_head_bucket(s3_resource, bucket_name):
+    """ Try to get the header info of a bucket, in order to 
+    check if it exists and its permissions
+    """
+
+    import botocore
+
+    # Try fetch the bucket with the name argument
+    try:
+        s3_resource.meta.client.head_bucket(Bucket=bucket_name)
+    except botocore.exceptions.ClientError as exc:
+        error_code = int(exc.response['Error']['Code'])
+        if error_code == 403:
+            err_msg = 'Access to bucket: %s is denied; check credentials'\
+                        % bucket_name
+            raise Exception(err_msg)
+        elif error_code == 404:
+            err_msg = 'Bucket: %s does not exist; check spelling and try '\
+                        'again' % bucket_name
+            raise Exception(err_msg)
+        else:
+            err_msg = 'Unable to connect to bucket: %s. Error message:\n%s'\
+                        % (bucket_name, exc)
+    except Exception as exc:
+        err_msg = 'Unable to connect to bucket: %s. Error message:\n%s'\
+                    % (bucket_name, exc)
+        raise Exception(err_msg)
+
+
 class IOBase(BaseInterface):
     def _run_interface(self, runtime):
         return runtime
@@ -548,15 +577,15 @@ def _fetch_bucket(self, bucket_name):
 
         # And try fetch the bucket with the name argument
         try:
-            self._get_head_bucket(s3_resource, bucket_name)
+            get_head_bucket(s3_resource, bucket_name)
         except Exception as exc:
 
             # Try to connect anonymously
             s3_resource.meta.client.meta.events.register(
                 'choose-signer.s3.*', botocore.handlers.disable_signing)
 
             iflogger.info('Connecting to AWS: %s anonymously...', bucket_name)
-            self._get_head_bucket(s3_resource, bucket_name)
+            get_head_bucket(s3_resource, bucket_name)
 
         # Explicitly declare a secure SSL connection for bucket object
         bucket = s3_resource.Bucket(bucket_name)
@@ -565,32 +594,6 @@ def _fetch_bucket(self, bucket_name):
         return bucket
 
 
-    def _get_head_bucket(self, s3_resource, bucket_name):
-        
-        import botocore
-        
-        # And try fetch the bucket with the name argument
-        try:
-            s3_resource.meta.client.head_bucket(Bucket=bucket_name)
-        except botocore.exceptions.ClientError as exc:
-            error_code = int(exc.response['Error']['Code'])
-            if error_code == 403:
-                err_msg = 'Access to bucket: %s is denied; check credentials'\
-                          % bucket_name
-                raise Exception(err_msg)
-            elif error_code == 404:
-                err_msg = 'Bucket: %s does not exist; check spelling and try '\
-                          'again' % bucket_name
-                raise Exception(err_msg)
-            else:
-                err_msg = 'Unable to connect to bucket: %s. Error message:\n%s'\
-                          % (bucket_name, exc)
-        except Exception as exc:
-            err_msg = 'Unable to connect to bucket: %s. Error message:\n%s'\
-                      % (bucket_name, exc)
-            raise Exception(err_msg)
-
-
     # Send up to S3 method
     def _upload_to_s3(self, bucket, src, dst):
         '''
@@ -610,7 +613,7 @@ def _upload_to_s3(self, bucket, src, dst):
         s3_prefix = s3_str + bucket.name
 
         # Explicitly lower-case the "s3"
-        if dst[:len(s3_str)].lower().startswith(s3_str):
+        if dst[:len(s3_str)].lower() == s3_str:
             dst = s3_str + dst[len(s3_str):]
 
         # If src is a directory, collect files (this assumes dst is a dir too)