2
0
mirror of https://github.com/frappe/bench.git synced 2024-11-12 00:06:36 +00:00

[fix] reload(): use importlib for python3

reload() is an inbuilt function in python2 but has been moved to importlib since python3.4.

source: https://docs.python.org/3/library/importlib.html#importlib.reload

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
This commit is contained in:
Chinmay Pai 2018-09-21 13:47:21 +05:30
parent b5657c160c
commit 15d2c8df16
No known key found for this signature in database
GPG Key ID: 75507BE256F40CED
2 changed files with 4 additions and 0 deletions

View File

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

View File

@ -77,6 +77,8 @@ def _update(pull=False, patch=False, build=False, update_bench=False, auto=False
update_node_packages(bench_path=bench_path)
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)
import bench.utils, bench.app
print('Reloading bench...')