Commit f20f96bb authored by Gao, Shang's avatar Gao, Shang
Browse files

changed to get_input to raw_input

parent b34579dc

crossbow/crossbowGlobus.py

+4 −6
Original line number Diff line number Diff line
@@ -131,9 +131,7 @@ class crossbowGlobus(crossbowBase): 


        print('Please go to this URL and login: {0}'.format(authorize_url))



        get_input = getattr(__builtins__, 'raw_input', input)

        auth_code = get_input(

            'Please enter the code you get after login here: ').strip()

        auth_code = raw_input('Please enter the code you get after login here: ').strip()

        token_response = client.oauth2_exchange_code_for_tokens(auth_code)



        # return a set of tokens, organized by resource server name
@@ -231,7 +229,7 @@ class crossbowGlobus(crossbowBase): 
        print "uploading %s" % filename

        tdata = globus_sdk.TransferData(self.transfer, source_endpoint, self.cadesdtn,

                                    label="Crossbow Transfer", sync_level="checksum")

        tdata.add_item(resource_path,'/data/cades-crossbow/'+package+'/'+filename)

        tdata.add_item(resource_path,'/'+package+'/'+filename)

        transfer_result = self.transfer.submit_transfer(tdata)

        print "task_id =", transfer_result["task_id"]
@@ -269,7 +267,7 @@ class crossbowGlobus(crossbowBase): 
        pkg_metadata = self.ckan.action.package_show(id=package)

        resource_path = [metadata['url'] for metadata in pkg_metadata['resources'] \

                         if metadata['name']==resource][0]

        resource_path = resource_path.replace("file://CROSSBOW_NFS/", '/data/cades-crossbow/')

        resource_path = resource_path.replace("file://CROSSBOW_NFS/", '/')

        filename = os.path.basename(resource_path)



        #make sure endpoints are activated
@@ -322,7 +320,7 @@ class crossbowGlobus(crossbowBase): 
        #delete file using globus

        resource_path = [metadata['url'] for metadata in pkg_metadata['resources'] \

                         if metadata['name']==resource][0]

        resource_path = resource_path.replace("file://CROSSBOW_NFS/", '/data/cades-crossbow/')

        resource_path = resource_path.replace("file://CROSSBOW_NFS/", '/')

        ddata = globus_sdk.DeleteData(self.transfer, self.cadesdtn)

        ddata.add_item(resource_path)

        delete_result = self.transfer.submit_delete(ddata)