Skip to content

Commit

Permalink
Rename setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
crugas committed Jun 26, 2020
1 parent e5025be commit e00b9af
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions as_xtf_GUI.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import as_export as asx
import cleanup as clean
import xtf_upload as xup
import setup as setup
import defaults_setup as dsetup


def run_gui(defaults):
Expand Down Expand Up @@ -325,7 +325,7 @@ def run_gui(defaults):
reset_defaults = sg.PopupYesNo("You are about to reset your configurations.\n"
"Are you sure?")
if reset_defaults == "Yes":
setup.reset_defaults()
dsetup.reset_defaults()
# ------------------- EDIT -------------------
if event_simple == "Change ASpace Login Credentials":
as_username, as_password, as_api, close_program_as, client, version, repositories, xtf_version = \
Expand Down Expand Up @@ -1235,14 +1235,14 @@ def setup_files():
elif "source_labels" in directories:
continue
else:
setup.create_default_folders()
dsetup.create_default_folders()
try:
with open("defaults.json", "r") as DEFAULTS:
json_data = json.load(DEFAULTS)
DEFAULTS.close()
except Exception as defaults_error:
print(str(defaults_error) + "\nThere was an error reading the defaults.json file. Recreating one now...")
json_data = setup.set_defaults_file()
json_data = dsetup.set_defaults_file()
print("Done")
return json_data

Expand Down
File renamed without changes.

0 comments on commit e00b9af

Please sign in to comment.