Remove all 'import *'

Author: BartoszCki

paperspace/__init__.py

@@ -6,7 +6,7 @@
 from . import scripts
 from . import templates
 from . import users
-from .config import *
+from .config import config
 from .jobs import run
 from .login import login, logout
 from .method import print_json_pretty

paperspace/config.py

@@ -4,25 +4,28 @@
 
 # TODO: this function is copy-pasted from login.py;
 #  there is something weird going one with imports in __init__.py and I'm unable to import apikey now
-def apikey():
-    paperspace_dir = os.path.expanduser('~/.paperspace')
-    config_path = os.path.join(paperspace_dir, 'config.json')
+def get_api_key(config_dir_path, config_file_name):
+    paperspace_dir = os.path.expanduser(config_dir_path)
+    config_path = os.path.join(paperspace_dir, config_file_name)
     if os.path.exists(config_path):
         config_data = json.load(open(config_path))
         if config_data and 'apiKey' in config_data:
             return config_data['apiKey']
     return ''
 
 
-_DEFAULT_PAPERSPACE_API_KEY = apikey()
 _DEFAULT_CONFIG_HOST = "https://api.paperspace.io"
 _DEFAULT_CONFIG_LOG_HOST = "https://logs.paperspace.io"
 _DEFAULT_CONFIG_EXPERIMENTS_HOST = "https://services.paperspace.io/experiments/v1/"  # TODO: validate this
+_DEFAULT_CONFIG_DIR_PATH = "~/.paperspace"
+_DEFAULT_CONFIG_FILE_NAME = os.path.expanduser("config.json")
 
 
 class config(object):
     DEBUG = os.environ.get("PAPERSPACE_CLI_DEBUG") in ("true", "1")
-    PAPERSPACE_API_KEY = os.environ.get("PAPERSPACE_API_KEY", _DEFAULT_PAPERSPACE_API_KEY)
     CONFIG_HOST = os.environ.get("PAPERSPACE_CONFIG_HOST", _DEFAULT_CONFIG_HOST)
     CONFIG_LOG_HOST = os.environ.get("PAPERSPACE_CONFIG_LOG_HOST", _DEFAULT_CONFIG_LOG_HOST)
     CONFIG_EXPERIMENTS_HOST = os.environ.get("PAPERSPACE_CONFIG_EXPERIMENTS_HOST", _DEFAULT_CONFIG_EXPERIMENTS_HOST)
+    CONFIG_DIR_PATH = os.path.expanduser(os.environ.get("PAPERSPACE_CONFIG_PATH", _DEFAULT_CONFIG_DIR_PATH))
+    CONFIG_FILE_NAME = os.environ.get("PAPERSPACE_CONFIG_FILE_NAME", _DEFAULT_CONFIG_FILE_NAME)
+    PAPERSPACE_API_KEY = os.environ.get("PAPERSPACE_API_KEY", get_api_key(CONFIG_DIR_PATH, CONFIG_FILE_NAME))

paperspace/login.py

@@ -1,11 +1,12 @@
 import getpass
 import json
+import os
 
 import requests
 from six.moves import input
 
 from paperspace import logger
-from .config import *
+from .config import config
 from .method import requests_exception_to_error_obj, response_error_check, status_code_to_error_obj
 
 UNAUTHORIZED_EXTENDED_INFO = '\n\nNote: Please keep in mind that currently you can login only with the email and ' \

paperspace/machines.py

@@ -1,4 +1,8 @@
-from .method import *
+import time
+
+import paperspace
+from .method import method
+
 
 def availability(params):
     return method('machines', 'getAvailability', params)
@@ -52,6 +56,7 @@ def waitfor(params):
         state = machine['state']
     return machine
 
+
 def update(params):
     return method('machines', 'updateMachinePublic', params)
 

paperspace/method.py

@@ -1,3 +1,5 @@
+import json
+import os
 import subprocess
 import sys
 import tempfile
@@ -6,7 +8,7 @@
 import requests
 
 from paperspace import logger
-from .config import *
+from .config import config
 from .version import version
 
 

paperspace/networks.py

@@ -1,4 +1,4 @@
-from .method import *
+from .method import method
 
 def list(params={}):
     return method('networks', 'getNetworks', params)

paperspace/scripts.py

@@ -1,4 +1,4 @@
-from .method import *
+from .method import method
 
 def create(params):
     return method('scripts', 'createScript', params)

paperspace/templates.py

@@ -1,4 +1,4 @@
-from .method import *
+from .method import method
 
 def list(params={}):
     return method('templates', 'getTemplates', params)

paperspace/users.py

@@ -1,4 +1,4 @@
-from .method import *
+from .method import method
 
 def list(params={}):
     return method('users', 'getUsers', params)