Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes, see individual commits for the explanation #21

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Minor fixes, see individual commits for the explanation #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34634a7
BF: There should be no __init__.py at the top level
yarikoptic Sep 20, 2019
5caaa91
RF: avoid code duplication, use os.path.join over all components of t…
yarikoptic Sep 20, 2019
f495f4e
ENH: fix prompt formatting for access_key
yarikoptic Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NDATools/Configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def read_user_credentials(self):
self.password = getpass.getpass('Enter your NIMH Data Archives password:')

if not self.aws_access_key:
self.aws_access_key = getpass.getpass('Enter your aws_access_key. If none, hit "Enter:"')
self.aws_access_key = getpass.getpass('Enter your aws_access_key. If none, hit "Enter":')

if not self.aws_secret_key:
self.aws_secret_key = getpass.getpass('Enter your aws_secret_key. If none, hit "Enter":')
5 changes: 3 additions & 2 deletions NDATools/clientscripts/vtcmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ def configure(args):
# create a new config file in user's home directory if one does not exist

NDATools.Utils.logging.getLogger().setLevel(logging.DEBUG)
if os.path.isfile(os.path.join(os.path.expanduser('~'), '.NDATools/settings.cfg')):
config = ClientConfiguration(os.path.join(os.path.expanduser('~'), '.NDATools/settings.cfg'), args.username,
config_file = os.path.join(os.path.expanduser('~'), '.NDATools', 'settings.cfg')
if os.path.isfile(config_file):
config = ClientConfiguration(config_file, args.username,
args.password, args.accessKey, args.secretKey)
else:
config = ClientConfiguration('clientscripts/config/settings.cfg', args.username, args.password, args.accessKey,
Expand Down
Empty file removed __init__.py
View file
Open in desktop
Empty file.