Merge branch 'mergenick' into mergenickmaster
This commit is contained in:
commit
b47da779cb
6 changed files with 29 additions and 97 deletions
|
@ -44,12 +44,6 @@ if sys.version_info[0] == 2 or sys.version_info[1] < onionrvalues.MIN_PY_VERSION
|
|||
sys.stderr.write('Error, Onionr requires Python 3.%s+\n' % (onionrvalues.MIN_PY_VERSION,))
|
||||
sys.exit(1)
|
||||
|
||||
# Ensure Python interpreter is not optimized TODO: Remove asserts and replace with ifs
|
||||
from utils import detectoptimization
|
||||
if detectoptimization.detect_optimization():
|
||||
sys.stderr.write('Error, Onionr cannot be run with an optimized Python interpreter\n')
|
||||
sys.exit(2)
|
||||
|
||||
# Create Onionr data directories, must be done before most imports
|
||||
from utils import createdirs
|
||||
createdirs.create_dirs()
|
||||
|
@ -65,4 +59,4 @@ def onionr_main():
|
|||
return
|
||||
|
||||
if __name__ == "__main__":
|
||||
onionr_main()
|
||||
onionr_main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue