accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-12 00:06:36 +00:00
Code Issues Releases Activity

fix: importing reload caused issues in python2

Browse Source
This commit is contained in:
Sagar Vora 2019-01-29 23:52:31 +05:30
parent 4d02801f53
commit 47a9aca0e7
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bench/app.py
View File

@ -379,12 +379,14 @@ def switch_branch(branch, apps=None, bench_path='.', upgrade=False, check_upgrad
print("Successfully switched branches for:\n" + "\n".join(switched_apps)) print("Successfully switched branches for:\n" + "\n".join(switched_apps))
if version_upgrade[0] and upgrade: if version_upgrade[0] and upgrade:
if sys.version_info >= (3, 4):
from importlib import reload
reload(utils)
update_requirements() update_requirements()
update_node_packages() update_node_packages()
pre_upgrade(version_upgrade[1], version_upgrade[2]) pre_upgrade(version_upgrade[1], version_upgrade[2])
if sys.version_info >= (3, 4):
+ import importlib
importlib.reload(utils)
else:
reload(utils)
backup_all_sites() backup_all_sites()
patch_sites() patch_sites()
build_assets() build_assets()

11
bench/commands/update.py
View File

@ -77,13 +77,16 @@ def _update(pull=False, patch=False, build=False, update_bench=False, auto=False
update_node_packages(bench_path=bench_path) update_node_packages(bench_path=bench_path)
if version_upgrade[0] or (not version_upgrade[0] and force): if version_upgrade[0] or (not version_upgrade[0] and force):
if sys.version_info >= (3, 4):
from importlib import reload
pre_upgrade(version_upgrade[1], version_upgrade[2], bench_path=bench_path) pre_upgrade(version_upgrade[1], version_upgrade[2], bench_path=bench_path)
import bench.utils, bench.app import bench.utils, bench.app
print('Reloading bench...') print('Reloading bench...')
reload(bench.utils) if sys.version_info >= (3, 4):
reload(bench.app) + import importlib
importlib.reload(bench.utils)
importlib.reload(bench.app)
else:
reload(bench.utils)
reload(bench.app)
if patch: if patch:
if not no_backup: if not no_backup: