Fix minor issue with default keychain file format and entry examples.

bdbag/fetch/auth/keychain.py

@@ -12,7 +12,7 @@
 DEFAULT_KEYCHAIN_FILE = os.path.join(DEFAULT_KEYCHAIN_PATH, 'keychain.json')
 DEFAULT_KEYCHAIN = [
     {
-        "uri": "https://",
+        "uri": "https://<hostname>/<path>",
         "auth_uri": "",
         "auth_type": "http-form",
         "auth_params": {
@@ -25,15 +25,15 @@
         }
     },
     {
-        "uri": "ftp://",
+        "uri": "ftp://<hostname>/<path>",
         "auth_type": "ftp-basic",
         "auth_params": {
             "username": "",
             "password": ""
         }
     },
     {
-        "uri": "globus://",
+        "uri": "globus://<endpoint>/<path>",
         "auth_type": "token",
         "auth_params": {
             "local_endpoint": "",

bdbag/fetch/transports/fetch_globus.py

@@ -55,12 +55,12 @@ def get_file(url, output_path, auth_config, token=None, dest_endpoint=None):
             token, dest_endpoint = authenticate(url, auth_config)
         if token is None:
             logger.warn("A valid Globus access token is required to create transfers. "
-                        "Check keychain.cfg for valid parameters.")
+                        "Check keychain.json for valid parameters.")
             return False
 
         if dest_endpoint is None:
             logger.warn("A valid Globus destination endpoint must be specified. "
-                        "Check keychain.cfg for valid parameters.")
+                        "Check keychain.json for valid parameters.")
             return False
 
         # initialize transfer client

setup.py

@@ -18,7 +18,7 @@
     url='https://github.com/ini-bdds/bdbag/',
     maintainer='USC Information Sciences Institute, Informatics Systems Research Division',
     maintainer_email='[email protected]',
-    version="1.1.2",
+    version="1.1.3",
     packages=find_packages(),
     package_data={'bdbag': ['profiles/*.*']},
     test_suite='test',