Drop support for retired Python 3.5

Upgrade syntax using `pyupgrade --py36-plus` .

Manually drop several `six` imports.

Also:
- Remove broken pr_cache in scripts/bootstrap_history.py
- Fix broken prefix removal in lib/galaxy/tool_util/deps/mulled/mulled_build.py
This commit is contained in:
Nicola Soranzo
2020-10-07 11:52:13 +01:00
parent 57d6a3857d
commit 9d74bba7fb
622 changed files with 1918 additions and 2175 deletions
+2 -2
View File
@@ -27,11 +27,11 @@ def stop_err(msg):
def load_input_parameters(filename, erase_file=True):
datasource_params = {}
try:
json_params = loads(open(filename, 'r').read())
json_params = loads(open(filename).read())
datasource_params = json_params.get('param_dict')
except Exception:
json_params = None
for line in open(filename, 'r'):
for line in open(filename):
try:
line = line.strip()
fields = line.split('\t')