Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Fix pyyaml patch
· 3b3309c0
Andreas Tille
authored
Nov 13, 2019
3b3309c0
Fix Python3 patch
· 639914be
Andreas Tille
authored
Nov 13, 2019
639914be
Show whitespace changes
Inline
Side-by-side
debian/patches/python3.patch
View file @
639914be
...
...
@@ -120,7 +120,7 @@ Description: Make sure Python3 interpreter is used in scripts
with open(cfg_file) as infile:
for line in infile:
- for src, target in replacements.iteritems():
+ for src, target in
list(
replacements.
iter
items()
)
:
+ for src, target in replacements.items():
line = line.replace(src, target)
lines.append(line)
with open(cfg_file, 'w') as outfile:
...
...
@@ -129,7 +129,7 @@ Description: Make sure Python3 interpreter is used in scripts
with open(cfg_file) as infile:
for line in infile:
- for src, target in replacements.iteritems():
+ for src, target in
list(
replacements.
iter
items()
)
:
+ for src, target in replacements.items():
line = line.replace(src, target)
lines.append(line)
with open(cfg_file, 'w') as outfile:
...
...
debian/patches/yaml_load.patch
View file @
639914be
...
...
@@ -10,7 +10,7 @@ Description: Specify yaml loader
log.info(" Reads:")
- dataset_data = pyyaml.load(open(cfg["dataset"].yaml_filename, 'r'))
+ dataset_data = pyyaml.load(open(cfg["dataset"].yaml_filename, 'r'), Loader=yaml.FullLoader)
+ dataset_data = pyyaml.load(open(cfg["dataset"].yaml_filename, 'r'), Loader=
py
yaml.FullLoader)
dataset_data = support.relative2abs_paths(dataset_data, os.path.dirname(cfg["dataset"].yaml_filename))
support.pretty_print_reads(dataset_data, log)