Merge branch 'master' into master
This commit is contained in:
commit
77f69f844b
|
|
@ -29,17 +29,17 @@ def find_examples():
|
|||
def find(url):
|
||||
parsed_url = urlparse(url)
|
||||
if not parsed_url.scheme:
|
||||
examples = find_examples()
|
||||
if f"{url}.py" in examples:
|
||||
return open(examples[f"{url}.py"]).read()
|
||||
try:
|
||||
return open(url, 'r').read()
|
||||
except FileNotFoundError:
|
||||
return ProfileNotFound(f"File {url} does not exist")
|
||||
examples = find_examples()
|
||||
if f"{url}.py" in examples:
|
||||
return open(examples[f"{url}.py"]).read()
|
||||
try:
|
||||
return open(url, 'r').read()
|
||||
except FileNotFoundError:
|
||||
return ProfileNotFound(f"File {url} does not exist")
|
||||
elif parsed_url.scheme in ('https', 'http'):
|
||||
return urllib.request.urlopen(url).read().decode('utf-8')
|
||||
return urllib.request.urlopen(url).read().decode('utf-8')
|
||||
else:
|
||||
return ProfileNotFound(f"Cannot handle scheme {parsed_url.scheme}")
|
||||
return ProfileNotFound(f"Cannot handle scheme {parsed_url.scheme}")
|
||||
|
||||
|
||||
def run_as_a_module():
|
||||
|
|
@ -48,21 +48,24 @@ def run_as_a_module():
|
|||
a nuitka3 compiled version of the project.
|
||||
This function and the file __main__ acts as a entry point.
|
||||
"""
|
||||
|
||||
if len(sys.argv) == 1:
|
||||
sys.argv.append('guided')
|
||||
sys.argv.append('guided')
|
||||
|
||||
try:
|
||||
profile = find(sys.argv[1])
|
||||
profile = find(sys.argv[1])
|
||||
except ProfileNotFound as err:
|
||||
print(f"Couldn't find file: {err}")
|
||||
sys.exit(1)
|
||||
print(f"Couldn't find file: {err}")
|
||||
sys.exit(1)
|
||||
|
||||
os.chdir(os.path.abspath(os.path.dirname(__file__)))
|
||||
|
||||
try:
|
||||
exec(profile) # Is this is very safe?
|
||||
exec(profile) # Is this is very safe?
|
||||
except Exception as err:
|
||||
print(f"Failed to run profile... {err}")
|
||||
sys.exit(1) # Should prompt for another profile path instead
|
||||
|
||||
print(f"Failed to run profile... {err}")
|
||||
sys.exit(1) # Should prompt for another profile path instead
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
run_as_a_module()
|
||||
|
|
|
|||
Loading…
Reference in New Issue